Fixed buffer overflows with safe str search
1. Detected a lot of memory errors using address sanitizer and ndpi-scapy tool. 2. Added ndpi_match_prefix function that compares strings with taking care of payload packet len. Almost drop-in replacement for match_first_bytes function. 3. Replaced unsafe match_first_bytes usage with a ndpi_match_prefix and additional length checks.
This commit is contained in:
@@ -32,6 +32,9 @@
|
||||
#include "ndpi_protocols.h"
|
||||
#include "ndpi_api.h"
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
void *ndpi_tdelete(const void * __restrict, void ** __restrict,
|
||||
int (*)(const void *, const void *));
|
||||
@@ -107,4 +110,19 @@ void ndpi_debug_get_last_log_function_line(struct ndpi_detection_module_struct *
|
||||
const char **file, const char **func, u_int32_t * line);
|
||||
#endif
|
||||
|
||||
/** Checks when the @p payload starts with the string literal @p str.
|
||||
* When the string is larger than the payload, check fails.
|
||||
* @return non-zero if check succeeded
|
||||
*/
|
||||
int ndpi_match_prefix(const u_int8_t *payload, size_t payload_len,
|
||||
const char *str, size_t str_len);
|
||||
|
||||
/* version of ndpi_match_prefix with string literal */
|
||||
#define ndpi_match_strprefix(payload, payload_len, str) \
|
||||
ndpi_match_prefix((payload), (payload_len), (str), (sizeof(str)-1))
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif /* __NDPI_MAIN_H__ */
|
||||
|
||||
@@ -4339,6 +4339,16 @@ char* ndpi_strnstr(const char *s, const char *find, size_t slen) {
|
||||
|
||||
/* ****************************************************** */
|
||||
|
||||
int ndpi_match_prefix(const u_int8_t *payload, size_t payload_len,
|
||||
const char *str, size_t str_len)
|
||||
{
|
||||
return str_len <= payload_len
|
||||
? memcmp(payload, str, str_len) == 0
|
||||
: 0;
|
||||
}
|
||||
|
||||
/* ****************************************************** */
|
||||
|
||||
int ndpi_match_string_subprotocol(struct ndpi_detection_module_struct *ndpi_struct,
|
||||
char *string_to_match, u_int string_to_match_len,
|
||||
u_int8_t is_host_match) {
|
||||
|
||||
+228
-228
File diff suppressed because it is too large
Load Diff
@@ -60,13 +60,14 @@ static int ndpi_match_ftp_data_directory(struct ndpi_detection_module_struct *nd
|
||||
|
||||
static int ndpi_match_file_header(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow) {
|
||||
struct ndpi_packet_struct *packet = &flow->packet;
|
||||
u_int32_t payload_len = packet->payload_packet_len;
|
||||
|
||||
/* A FTP packet is pretty long so 256 is a bit consrvative but it should be OK */
|
||||
if(packet->payload_packet_len < 256)
|
||||
return 0;
|
||||
|
||||
/* RIFF is a meta-format for storing AVI and WAV files */
|
||||
if(match_first_bytes(packet->payload, "RIFF"))
|
||||
if(ndpi_match_strprefix(packet->payload, payload_len, "RIFF"))
|
||||
return 1;
|
||||
|
||||
/* MZ is a .exe file */
|
||||
@@ -74,7 +75,7 @@ static int ndpi_match_file_header(struct ndpi_detection_module_struct *ndpi_stru
|
||||
return 1;
|
||||
|
||||
/* Ogg files */
|
||||
if(match_first_bytes(packet->payload, "OggS"))
|
||||
if(ndpi_match_strprefix(packet->payload, payload_len, "OggS"))
|
||||
return 1;
|
||||
|
||||
/* ZIP files */
|
||||
@@ -86,7 +87,7 @@ static int ndpi_match_file_header(struct ndpi_detection_module_struct *ndpi_stru
|
||||
return 1;
|
||||
|
||||
/* RAR files */
|
||||
if(match_first_bytes(packet->payload, "Rar!"))
|
||||
if(ndpi_match_strprefix(packet->payload, payload_len, "Rar!"))
|
||||
return 1;
|
||||
|
||||
/* EBML */
|
||||
@@ -98,7 +99,7 @@ static int ndpi_match_file_header(struct ndpi_detection_module_struct *ndpi_stru
|
||||
return 1;
|
||||
|
||||
/* GIF */
|
||||
if(match_first_bytes(packet->payload, "GIF8"))
|
||||
if(ndpi_match_strprefix(packet->payload, payload_len, "GIF8"))
|
||||
return 1;
|
||||
|
||||
/* PHP scripts */
|
||||
@@ -110,7 +111,7 @@ static int ndpi_match_file_header(struct ndpi_detection_module_struct *ndpi_stru
|
||||
return 1;
|
||||
|
||||
/* PDFs */
|
||||
if(match_first_bytes(packet->payload, "%PDF"))
|
||||
if(ndpi_match_strprefix(packet->payload, payload_len, "%PDF"))
|
||||
return 1;
|
||||
|
||||
/* PNG */
|
||||
@@ -118,7 +119,7 @@ static int ndpi_match_file_header(struct ndpi_detection_module_struct *ndpi_stru
|
||||
return 1;
|
||||
|
||||
/* HTML */
|
||||
if(match_first_bytes(packet->payload, "<htm"))
|
||||
if(ndpi_match_strprefix(packet->payload, payload_len, "<htm"))
|
||||
return 1;
|
||||
if((packet->payload[0] == 0x0a) && (packet->payload[1] == '<') && (packet->payload[2] == '!') && (packet->payload[3] == 'D'))
|
||||
return 1;
|
||||
@@ -132,17 +133,17 @@ static int ndpi_match_file_header(struct ndpi_detection_module_struct *ndpi_stru
|
||||
return 1;
|
||||
|
||||
/* XML */
|
||||
if(match_first_bytes(packet->payload, "<!DO"))
|
||||
if(ndpi_match_strprefix(packet->payload, payload_len, "<!DO"))
|
||||
return 1;
|
||||
|
||||
/* FLAC */
|
||||
if(match_first_bytes(packet->payload, "fLaC"))
|
||||
if(ndpi_match_strprefix(packet->payload, payload_len, "fLaC"))
|
||||
return 1;
|
||||
|
||||
/* MP3 */
|
||||
if((packet->payload[0] == 'I') && (packet->payload[1] == 'D') && (packet->payload[2] == '3') && (packet->payload[3] == 0x03))
|
||||
return 1;
|
||||
if(match_first_bytes(packet->payload, "\xff\xfb\x90\xc0"))
|
||||
if(ndpi_match_strprefix(packet->payload, payload_len, "\xff\xfb\x90\xc0"))
|
||||
return 1;
|
||||
|
||||
/* RPM */
|
||||
@@ -150,7 +151,7 @@ static int ndpi_match_file_header(struct ndpi_detection_module_struct *ndpi_stru
|
||||
return 1;
|
||||
|
||||
/* Wz Patch */
|
||||
if(match_first_bytes(packet->payload, "WzPa"))
|
||||
if(ndpi_match_strprefix(packet->payload, payload_len, "WzPa"))
|
||||
return 1;
|
||||
|
||||
/* Flash Video */
|
||||
@@ -158,7 +159,7 @@ static int ndpi_match_file_header(struct ndpi_detection_module_struct *ndpi_stru
|
||||
return 1;
|
||||
|
||||
/* .BKF (Microsoft Tape Format) */
|
||||
if(match_first_bytes(packet->payload, "TAPE"))
|
||||
if(ndpi_match_strprefix(packet->payload, payload_len, "TAPE"))
|
||||
return 1;
|
||||
|
||||
/* MS Office Doc file - this is unpleasantly geeky */
|
||||
@@ -174,23 +175,23 @@ static int ndpi_match_file_header(struct ndpi_detection_module_struct *ndpi_stru
|
||||
return 1;
|
||||
|
||||
/* ar archive, typically .deb files */
|
||||
if(match_first_bytes(packet->payload, "!<ar"))
|
||||
if(ndpi_match_strprefix(packet->payload, payload_len, "!<ar"))
|
||||
return 1;
|
||||
|
||||
/* Raw XML (skip jabber-like traffic as this is not FTP but unencrypted jabber) */
|
||||
if((match_first_bytes(packet->payload, "<?xm"))
|
||||
if((ndpi_match_strprefix(packet->payload, payload_len, "<?xm"))
|
||||
&& (ndpi_strnstr((const char *)packet->payload, "jabber", packet->payload_packet_len) == NULL))
|
||||
return 1;
|
||||
|
||||
if(match_first_bytes(packet->payload, "<iq "))
|
||||
if(ndpi_match_strprefix(packet->payload, payload_len, "<iq "))
|
||||
return 1;
|
||||
|
||||
/* SPF */
|
||||
if(match_first_bytes(packet->payload, "SPFI"))
|
||||
if(ndpi_match_strprefix(packet->payload, payload_len, "SPFI"))
|
||||
return 1;
|
||||
|
||||
/* ABIF - Applied Biosystems */
|
||||
if(match_first_bytes(packet->payload, "ABIF"))
|
||||
if(ndpi_match_strprefix(packet->payload, payload_len, "ABIF"))
|
||||
return 1;
|
||||
|
||||
/* bzip2 - other digits are also possible instead of 9 */
|
||||
@@ -203,11 +204,11 @@ static int ndpi_match_file_header(struct ndpi_detection_module_struct *ndpi_stru
|
||||
return 1;
|
||||
if((packet->payload[0] == '<') && (packet->payload[1] == 'C') && (packet->payload[2] == 'F'))
|
||||
return 1;
|
||||
if(match_first_bytes(packet->payload, ".tem"))
|
||||
if(ndpi_match_strprefix(packet->payload, payload_len, ".tem"))
|
||||
return 1;
|
||||
if(match_first_bytes(packet->payload, ".ite"))
|
||||
if(ndpi_match_strprefix(packet->payload, payload_len, ".ite"))
|
||||
return 1;
|
||||
if(match_first_bytes(packet->payload, ".lef"))
|
||||
if(ndpi_match_strprefix(packet->payload, payload_len, ".lef"))
|
||||
return 1;
|
||||
|
||||
return 0;
|
||||
|
||||
@@ -130,7 +130,7 @@ static void ndpi_search_msn_tcp(struct ndpi_detection_module_struct *ndpi_struct
|
||||
if (get_u_int8_t(packet->payload, packet->payload_packet_len - 2) == 0x0d
|
||||
&& get_u_int8_t(packet->payload, packet->payload_packet_len - 1) == 0x0a) {
|
||||
/* The MSNP string is used in XBOX clients. */
|
||||
if (memcmp(packet->payload, "VER ", 4) == 0) {
|
||||
if (ndpi_match_strprefix(packet->payload, packet->payload_packet_len, "VER ")) {
|
||||
|
||||
if (memcmp(&packet->payload[packet->payload_packet_len - 6], "CVR",
|
||||
3) == 0 || memcmp(&packet->payload[packet->payload_packet_len - 8], "MSNP", 4) == 0) {
|
||||
@@ -139,7 +139,7 @@ static void ndpi_search_msn_tcp(struct ndpi_detection_module_struct *ndpi_struct
|
||||
ndpi_int_msn_add_connection(ndpi_struct, flow);
|
||||
return;
|
||||
}
|
||||
if (memcmp(&packet->payload[4], "MSNFT", 5) == 0) {
|
||||
if (ndpi_match_strprefix(&packet->payload[4], packet->payload_packet_len-4, "MSNFT")) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_MSN, ndpi_struct, NDPI_LOG_TRACE,
|
||||
"found MSN FT by pattern VER MSNFT...0d0a.\n");
|
||||
ndpi_int_msn_add_connection(ndpi_struct, flow);
|
||||
@@ -153,8 +153,8 @@ static void ndpi_search_msn_tcp(struct ndpi_detection_module_struct *ndpi_struct
|
||||
#ifdef NDPI_PROTOCOL_HTTP
|
||||
packet->detected_protocol_stack[0] == NDPI_PROTOCOL_HTTP ||
|
||||
#endif
|
||||
memcmp(packet->payload, "GET ", NDPI_STATICSTRING_LEN("GET ")) == 0 ||
|
||||
memcmp(packet->payload, "POST ", NDPI_STATICSTRING_LEN("POST ")) == 0) {
|
||||
ndpi_match_strprefix(packet->payload, packet->payload_packet_len, "GET ") ||
|
||||
ndpi_match_strprefix(packet->payload, packet->payload_packet_len, "POST ")) {
|
||||
ndpi_parse_packet_line_info(ndpi_struct, flow);
|
||||
if (packet->user_agent_line.ptr != NULL &&
|
||||
packet->user_agent_line.len > NDPI_STATICSTRING_LEN("Messenger/") &&
|
||||
@@ -277,8 +277,8 @@ static void ndpi_search_msn_tcp(struct ndpi_detection_module_struct *ndpi_struct
|
||||
#ifdef NDPI_PROTOCOL_HTTP
|
||||
packet->detected_protocol_stack[0] == NDPI_PROTOCOL_HTTP ||
|
||||
#endif
|
||||
(memcmp(packet->payload, "HTTP/1.0 200 OK", 15) == 0) ||
|
||||
(memcmp(packet->payload, "HTTP/1.1 200 OK", 15) == 0)
|
||||
ndpi_match_strprefix(packet->payload, packet->payload_packet_len, "HTTP/1.0 200 OK") ||
|
||||
ndpi_match_strprefix(packet->payload, packet->payload_packet_len, "HTTP/1.1 200 OK")
|
||||
) {
|
||||
|
||||
ndpi_parse_packet_line_info(ndpi_struct, flow);
|
||||
|
||||
@@ -34,7 +34,7 @@ static void ndpi_check_pando_tcp(struct ndpi_detection_module_struct *ndpi_struc
|
||||
struct ndpi_packet_struct *packet = &flow->packet;
|
||||
u_int32_t payload_len = packet->payload_packet_len;
|
||||
|
||||
if ((payload_len > 0) && match_first_bytes(packet->payload, "\x0ePan")) {
|
||||
if (ndpi_match_strprefix(packet->payload, payload_len, "\x0ePan")) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_PANDO, ndpi_struct, NDPI_LOG_DEBUG, "Found PANDO.\n");
|
||||
ndpi_int_pando_add_connection(ndpi_struct, flow);
|
||||
}
|
||||
@@ -56,7 +56,7 @@ static void ndpi_check_pando_udp(struct ndpi_detection_module_struct *ndpi_struc
|
||||
return;
|
||||
}
|
||||
|
||||
if ((payload_len > 0) && match_first_bytes(packet->payload, "UDPA")) {
|
||||
if (ndpi_match_strprefix(packet->payload, payload_len, "UDPA")) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_PANDO, ndpi_struct, NDPI_LOG_DEBUG, "Possible PANDO request detected, we will look further for the response...\n");
|
||||
|
||||
/* Encode the direction of the packet in the stage, so we will know when we need to look for the response packet. */
|
||||
@@ -64,7 +64,7 @@ static void ndpi_check_pando_udp(struct ndpi_detection_module_struct *ndpi_struc
|
||||
return;
|
||||
}
|
||||
|
||||
if ((payload_len > 0) && (match_first_bytes(packet->payload, "UDPR") || match_first_bytes(packet->payload, "UDPE"))) {
|
||||
if (ndpi_match_strprefix(packet->payload, payload_len, "UDPR") || ndpi_match_strprefix(packet->payload, payload_len, "UDPE")) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_PANDO, ndpi_struct, NDPI_LOG_DEBUG, "Possible PANDO request detected, we will look further for the response...\n");
|
||||
|
||||
/* Encode the direction of the packet in the stage, so we will know when we need to look for the response packet. */
|
||||
@@ -98,7 +98,7 @@ static void ndpi_check_pando_udp(struct ndpi_detection_module_struct *ndpi_struc
|
||||
}
|
||||
|
||||
/* This is a packet in another direction. Check if we find the proper response. */
|
||||
if ((payload_len == 0) || match_first_bytes(packet->payload, "UDPR") || match_first_bytes(packet->payload, "UDPE")) {
|
||||
if ((payload_len == 0) || (ndpi_match_strprefix(packet->payload, payload_len, "UDPR") || ndpi_match_strprefix(packet->payload, payload_len, "UDPE"))) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_PANDO, ndpi_struct, NDPI_LOG_DEBUG, "Found PANDO.\n");
|
||||
ndpi_int_pando_add_connection(ndpi_struct, flow);
|
||||
} else {
|
||||
@@ -115,7 +115,7 @@ static void ndpi_check_pando_udp(struct ndpi_detection_module_struct *ndpi_struc
|
||||
}
|
||||
|
||||
/* This is a packet in another direction. Check if we find the proper response. */
|
||||
if ((payload_len > 0) && match_first_bytes(packet->payload, "UDPA")) {
|
||||
if (ndpi_match_strprefix(packet->payload, payload_len, "UDPA")) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_PANDO, ndpi_struct, NDPI_LOG_DEBUG, "Found PANDO.\n");
|
||||
ndpi_int_pando_add_connection(ndpi_struct, flow);
|
||||
} else {
|
||||
|
||||
@@ -39,7 +39,7 @@ static void ndpi_check_pplive_udp1(struct ndpi_detection_module_struct *ndpi_str
|
||||
if (flow->pplive_stage1 == 0) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_PPLIVE, ndpi_struct, NDPI_LOG_DEBUG, "PPLIVE stage 0: \n");
|
||||
|
||||
if ((payload_len > 0) && match_first_bytes(packet->payload, "\xe9\x03\x41\x01")) {
|
||||
if (ndpi_match_strprefix(packet->payload, payload_len, "\xe9\x03\x41\x01")) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_PPLIVE, ndpi_struct, NDPI_LOG_DEBUG, "Possible PPLIVE request detected, we will look further for the response...\n");
|
||||
|
||||
/* Encode the direction of the packet in the stage, so we will know when we need to look for the response packet. */
|
||||
@@ -47,7 +47,7 @@ static void ndpi_check_pplive_udp1(struct ndpi_detection_module_struct *ndpi_str
|
||||
return;
|
||||
}
|
||||
|
||||
if ((payload_len > 0) && match_first_bytes(packet->payload, "\xe9\x03\x42\x01")) {
|
||||
if (ndpi_match_strprefix(packet->payload, payload_len, "\xe9\x03\x42\x01")) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_PPLIVE, ndpi_struct, NDPI_LOG_DEBUG, "Possible PPLIVE request detected, we will look further for the response...\n");
|
||||
|
||||
/* Encode the direction of the packet in the stage, so we will know when we need to look for the response packet. */
|
||||
@@ -55,7 +55,7 @@ static void ndpi_check_pplive_udp1(struct ndpi_detection_module_struct *ndpi_str
|
||||
return;
|
||||
}
|
||||
|
||||
if ((payload_len > 0) && match_first_bytes(packet->payload, "\x1c\x1c\x32\x01")) {
|
||||
if (ndpi_match_strprefix(packet->payload, payload_len, "\x1c\x1c\x32\x01")) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_PPLIVE, ndpi_struct, NDPI_LOG_DEBUG, "Possible PPLIVE request detected, we will look further for the response...\n");
|
||||
|
||||
/* Encode the direction of the packet in the stage, so we will know when we need to look for the response packet. */
|
||||
@@ -72,7 +72,7 @@ static void ndpi_check_pplive_udp1(struct ndpi_detection_module_struct *ndpi_str
|
||||
}
|
||||
|
||||
/* This is a packet in another direction. Check if we find the proper response. */
|
||||
if ((payload_len > 0) && (match_first_bytes(packet->payload, "\xe9\x03\x42\x01") || match_first_bytes(packet->payload, "\xe9\x03\x41\x01"))) {
|
||||
if (ndpi_match_strprefix(packet->payload, payload_len, "\xe9\x03\x42\x01") || ndpi_match_strprefix(packet->payload, payload_len, "\xe9\x03\x41\x01")) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_PPLIVE, ndpi_struct, NDPI_LOG_DEBUG, "Found PPLIVE.\n");
|
||||
ndpi_int_pplive_add_connection(ndpi_struct, flow);
|
||||
} else {
|
||||
@@ -89,7 +89,7 @@ static void ndpi_check_pplive_udp1(struct ndpi_detection_module_struct *ndpi_str
|
||||
}
|
||||
|
||||
/* This is a packet in another direction. Check if we find the proper response. */
|
||||
if ((payload_len > 0) && match_first_bytes(packet->payload, "\xe9\x03\x41\x01")) {
|
||||
if (ndpi_match_strprefix(packet->payload, payload_len, "\xe9\x03\x41\x01")) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_PPLIVE, ndpi_struct, NDPI_LOG_DEBUG, "Found PPLIVE.\n");
|
||||
ndpi_int_pplive_add_connection(ndpi_struct, flow);
|
||||
} else {
|
||||
@@ -105,7 +105,7 @@ static void ndpi_check_pplive_udp1(struct ndpi_detection_module_struct *ndpi_str
|
||||
}
|
||||
|
||||
/* This is a packet in another direction. Check if we find the proper response. */
|
||||
if ((payload_len > 0) && match_first_bytes(packet->payload, "\x1c\x1c\x32\x01")) {
|
||||
if (ndpi_match_strprefix(packet->payload, payload_len, "\x1c\x1c\x32\x01")) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_PPLIVE, ndpi_struct, NDPI_LOG_DEBUG, "Found PPLIVE.\n");
|
||||
ndpi_int_pplive_add_connection(ndpi_struct, flow);
|
||||
} else {
|
||||
@@ -124,7 +124,7 @@ static void ndpi_check_pplive_udp2(struct ndpi_detection_module_struct *ndpi_str
|
||||
if (flow->pplive_stage2 == 0) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_PPLIVE, ndpi_struct, NDPI_LOG_DEBUG, "PPLIVE stage 0: \n");
|
||||
|
||||
if ((payload_len == 57) && match_first_bytes(packet->payload, "\xe9\x03\x41\x01")) {
|
||||
if ((payload_len == 57) && ndpi_match_strprefix(packet->payload, payload_len, "\xe9\x03\x41\x01")) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_PPLIVE, ndpi_struct, NDPI_LOG_DEBUG, "Possible PPLIVE request detected, we will look further for the response...\n");
|
||||
|
||||
/* Encode the direction of the packet in the stage, so we will know when we need to look for the response packet. */
|
||||
|
||||
@@ -73,6 +73,8 @@ static void ndpi_rtp_search(struct ndpi_detection_module_struct *ndpi_struct,
|
||||
struct ndpi_flow_struct *flow,
|
||||
const u_int8_t * payload, const u_int16_t payload_len)
|
||||
{
|
||||
if (payload_len < 2)
|
||||
return;
|
||||
//struct ndpi_packet_struct *packet = &flow->packet;
|
||||
u_int8_t payloadType, payload_type = payload[1] & 0x7F;
|
||||
u_int32_t *ssid = (u_int32_t*)&payload[8];
|
||||
|
||||
@@ -49,9 +49,8 @@ u_int8_t ndpi_check_starcraft_tcp(struct ndpi_detection_module_struct* ndpi_stru
|
||||
{
|
||||
if (sc2_match_logon_ip(&flow->packet)
|
||||
&& flow->packet.tcp->dest == htons(1119) //bnetgame port
|
||||
&& flow->packet.payload_packet_len >= 10
|
||||
&& (match_first_bytes(flow->packet.payload, "\x4a\x00\x00\x0a\x66\x02\x0a\xed\x2d\x66")
|
||||
|| match_first_bytes(flow->packet.payload, "\x49\x00\x00\x0a\x66\x02\x0a\xed\x2d\x66")))
|
||||
&& (ndpi_match_strprefix(flow->packet.payload, flow->packet.payload_packet_len, "\x4a\x00\x00\x0a\x66\x02\x0a\xed\x2d\x66")
|
||||
|| ndpi_match_strprefix(flow->packet.payload, flow->packet.payload_packet_len, "\x49\x00\x00\x0a\x66\x02\x0a\xed\x2d\x66")))
|
||||
return 1;
|
||||
else
|
||||
return -1;
|
||||
|
||||
+11
-11
@@ -50,7 +50,7 @@ static void ndpi_check_steam_tcp(struct ndpi_detection_module_struct *ndpi_struc
|
||||
if (flow->steam_stage == 0) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_STEAM, ndpi_struct, NDPI_LOG_DEBUG, "STEAM stage 0: \n");
|
||||
|
||||
if (((payload_len == 1) || (payload_len == 4) || (payload_len == 5)) && match_first_bytes(packet->payload, "\x01\x00\x00\x00")) {
|
||||
if ((payload_len == 1 && packet->payload[0] == 0x01) || ((payload_len == 4 || payload_len == 5) && ndpi_match_strprefix(packet->payload, payload_len, "\x01\x00\x00\x00"))) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_STEAM, ndpi_struct, NDPI_LOG_DEBUG, "Possible STEAM request detected, we will look further for the response...\n");
|
||||
|
||||
/* Encode the direction of the packet in the stage, so we will know when we need to look for the response packet. */
|
||||
@@ -58,7 +58,7 @@ static void ndpi_check_steam_tcp(struct ndpi_detection_module_struct *ndpi_struc
|
||||
return;
|
||||
}
|
||||
|
||||
if (((payload_len == 1) || (payload_len == 4) || (payload_len == 5)) && (packet->payload[0] == 0x00) && (packet->payload[1] == 0x00) && (packet->payload[2] == 0x00)) {
|
||||
if ((payload_len == 1 && packet->payload[0] == 0x00) || ((payload_len == 4 || payload_len == 5) && ndpi_match_strprefix(packet->payload, payload_len, "\x00\x00\x00"))) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_STEAM, ndpi_struct, NDPI_LOG_DEBUG, "Possible STEAM request detected, we will look further for the response...\n");
|
||||
|
||||
/* Encode the direction of the packet in the stage, so we will know when we need to look for the response packet. */
|
||||
@@ -74,7 +74,7 @@ static void ndpi_check_steam_tcp(struct ndpi_detection_module_struct *ndpi_struc
|
||||
}
|
||||
|
||||
/* This is a packet in another direction. Check if we find the proper response. */
|
||||
if (((payload_len == 1) || (payload_len == 4) || (payload_len == 5)) && (packet->payload[0] == 0x00) && (packet->payload[1] == 0x00) && (packet->payload[2] == 0x00)) {
|
||||
if ((payload_len == 1 && packet->payload[0] == 0x00) || ((payload_len == 4 || payload_len == 5) && ndpi_match_strprefix(packet->payload, payload_len, "\x00\x00\x00"))) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_STEAM, ndpi_struct, NDPI_LOG_DEBUG, "Found STEAM.\n");
|
||||
ndpi_int_steam_add_connection(ndpi_struct, flow);
|
||||
} else {
|
||||
@@ -90,7 +90,7 @@ static void ndpi_check_steam_tcp(struct ndpi_detection_module_struct *ndpi_struc
|
||||
}
|
||||
|
||||
/* This is a packet in another direction. Check if we find the proper response. */
|
||||
if (((payload_len == 1) || (payload_len == 4) || (payload_len == 5)) && match_first_bytes(packet->payload, "\x01\x00\x00\x00")) {
|
||||
if ((payload_len == 1 && packet->payload[0] == 0x01) || ((payload_len == 4 || payload_len == 5) && ndpi_match_strprefix(packet->payload, payload_len, "\x01\x00\x00\x00"))) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_STEAM, ndpi_struct, NDPI_LOG_DEBUG, "Found STEAM.\n");
|
||||
ndpi_int_steam_add_connection(ndpi_struct, flow);
|
||||
} else {
|
||||
@@ -104,7 +104,7 @@ static void ndpi_check_steam_udp1(struct ndpi_detection_module_struct *ndpi_stru
|
||||
struct ndpi_packet_struct *packet = &flow->packet;
|
||||
u_int32_t payload_len = packet->payload_packet_len;
|
||||
|
||||
if ((payload_len > 0) && match_first_bytes(packet->payload, "VS01")) {
|
||||
if (ndpi_match_strprefix(packet->payload, payload_len, "VS01")) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_STEAM, ndpi_struct, NDPI_LOG_DEBUG, "Found STEAM.\n");
|
||||
ndpi_int_steam_add_connection(ndpi_struct, flow);
|
||||
return;
|
||||
@@ -114,7 +114,7 @@ static void ndpi_check_steam_udp1(struct ndpi_detection_module_struct *ndpi_stru
|
||||
if (flow->steam_stage1 == 0) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_STEAM, ndpi_struct, NDPI_LOG_DEBUG, "STEAM stage 0: \n");
|
||||
|
||||
if ((payload_len > 0) && match_first_bytes(packet->payload, "\x31\xff\x30\x2e")) {
|
||||
if (ndpi_match_strprefix(packet->payload, payload_len, "\x31\xff\x30\x2e")) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_STEAM, ndpi_struct, NDPI_LOG_DEBUG, "Possible STEAM request detected, we will look further for the response...\n");
|
||||
|
||||
/* Encode the direction of the packet in the stage, so we will know when we need to look for the response packet. */
|
||||
@@ -122,7 +122,7 @@ static void ndpi_check_steam_udp1(struct ndpi_detection_module_struct *ndpi_stru
|
||||
return;
|
||||
}
|
||||
|
||||
if ((payload_len > 0) && match_first_bytes(packet->payload, "\xff\xff\xff\xff")) {
|
||||
if (ndpi_match_strprefix(packet->payload, payload_len, "\xff\xff\xff\xff")) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_STEAM, ndpi_struct, NDPI_LOG_DEBUG, "Possible STEAM request detected, we will look further for the response...\n");
|
||||
|
||||
/* Encode the direction of the packet in the stage, so we will know when we need to look for the response packet. */
|
||||
@@ -139,7 +139,7 @@ static void ndpi_check_steam_udp1(struct ndpi_detection_module_struct *ndpi_stru
|
||||
}
|
||||
|
||||
/* This is a packet in another direction. Check if we find the proper response. */
|
||||
if ((payload_len > 0) && match_first_bytes(packet->payload, "\xff\xff\xff\xff")) {
|
||||
if (ndpi_match_strprefix(packet->payload, payload_len, "\xff\xff\xff\xff")) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_STEAM, ndpi_struct, NDPI_LOG_DEBUG, "Found STEAM.\n");
|
||||
ndpi_int_steam_add_connection(ndpi_struct, flow);
|
||||
} else {
|
||||
@@ -156,7 +156,7 @@ static void ndpi_check_steam_udp1(struct ndpi_detection_module_struct *ndpi_stru
|
||||
}
|
||||
|
||||
/* This is a packet in another direction. Check if we find the proper response. */
|
||||
if ((payload_len > 0) && match_first_bytes(packet->payload, "\x31\xff\x30\x2e")) {
|
||||
if (ndpi_match_strprefix(packet->payload, payload_len, "\x31\xff\x30\x2e")) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_STEAM, ndpi_struct, NDPI_LOG_DEBUG, "Found STEAM.\n");
|
||||
ndpi_int_steam_add_connection(ndpi_struct, flow);
|
||||
} else {
|
||||
@@ -175,7 +175,7 @@ static void ndpi_check_steam_udp2(struct ndpi_detection_module_struct *ndpi_stru
|
||||
if (flow->steam_stage2 == 0) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_STEAM, ndpi_struct, NDPI_LOG_DEBUG, "STEAM stage 0: \n");
|
||||
|
||||
if ((payload_len == 25) && match_first_bytes(packet->payload, "\xff\xff\xff\xff")) {
|
||||
if ((payload_len == 25) && ndpi_match_strprefix(packet->payload, payload_len, "\xff\xff\xff\xff")) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_STEAM, ndpi_struct, NDPI_LOG_DEBUG, "Possible STEAM request detected, we will look further for the response...\n");
|
||||
|
||||
/* Encode the direction of the packet in the stage, so we will know when we need to look for the response packet. */
|
||||
@@ -191,7 +191,7 @@ static void ndpi_check_steam_udp2(struct ndpi_detection_module_struct *ndpi_stru
|
||||
}
|
||||
|
||||
/* This is a packet in another direction. Check if we find the proper response. */
|
||||
if ((payload_len == 0) || match_first_bytes(packet->payload, "\xff\xff\xff\xff")) {
|
||||
if ((payload_len == 0) || ndpi_match_strprefix(packet->payload, payload_len, "\xff\xff\xff\xff")) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_STEAM, ndpi_struct, NDPI_LOG_DEBUG, "Found STEAM.\n");
|
||||
ndpi_int_steam_add_connection(ndpi_struct, flow);
|
||||
} else {
|
||||
|
||||
Reference in New Issue
Block a user