Merge branch 'dev' of https://github.com/ntop/nDPI into dev
This commit is contained in:
@@ -809,6 +809,12 @@ typedef enum {
|
||||
CUSTOM_CATEGORY_BANNED_SITE = 102,
|
||||
CUSTOM_CATEGORY_SITE_UNAVAILABLE = 103,
|
||||
CUSTOM_CATEGORY_ALLOWED_SITE = 104,
|
||||
/*
|
||||
The category below is used to track communications made by
|
||||
security applications (e.g. sophosxl.net, spamhaus.org)
|
||||
to track malware, spam etc.
|
||||
*/
|
||||
CUSTOM_CATEGORY_ANTIMALWARE = 105,
|
||||
|
||||
/*
|
||||
IMPORTANT
|
||||
|
||||
@@ -8686,6 +8686,7 @@ ndpi_protocol_match host_match[] = {
|
||||
{ "whispersystems.org", NULL, "whispersystems\\.org" TLD, "Signal", NDPI_PROTOCOL_SIGNAL, NDPI_PROTOCOL_CATEGORY_CHAT, NDPI_PROTOCOL_ACCEPTABLE },
|
||||
{ "musical.ly", NULL, "musical\\.ly" TLD, "TikTok", NDPI_PROTOCOL_TIKTOK, NDPI_PROTOCOL_CATEGORY_SOCIAL_NETWORK, NDPI_PROTOCOL_ACCEPTABLE },
|
||||
{ "muscdn.com", NULL, "muscndl\\.com" TLD, "TikTok", NDPI_PROTOCOL_TIKTOK, NDPI_PROTOCOL_CATEGORY_SOCIAL_NETWORK, NDPI_PROTOCOL_ACCEPTABLE },
|
||||
|
||||
{ NULL, NULL, NULL, 0 }
|
||||
};
|
||||
|
||||
|
||||
+2
-1
@@ -425,6 +425,7 @@ static const char* categories[] = {
|
||||
"Banned_Site",
|
||||
"Site_Unavailable",
|
||||
"Allowed_Site",
|
||||
"Antimalware",
|
||||
};
|
||||
|
||||
/* ****************************************** */
|
||||
@@ -2828,7 +2829,7 @@ int ndpi_handle_rule(struct ndpi_detection_module_struct *ndpi_mod,
|
||||
ndpi_mod->ndpi_num_supported_protocols,
|
||||
0 /* can_have_a_subprotocol */, no_master,
|
||||
no_master,
|
||||
ndpi_strdup(proto),
|
||||
proto,
|
||||
NDPI_PROTOCOL_CATEGORY_UNSPECIFIED, /* TODO add protocol category support in rules */
|
||||
ndpi_build_default_ports(ports_a, 0, 0, 0, 0, 0) /* TCP */,
|
||||
ndpi_build_default_ports(ports_b, 0, 0, 0, 0, 0) /* UDP */);
|
||||
|
||||
@@ -123,6 +123,28 @@ void ndpi_search_sip_handshake(struct ndpi_detection_module_struct
|
||||
return;
|
||||
}
|
||||
|
||||
if ((memcmp(packet_payload, "PUBLISH ", 8) == 0 || memcmp(packet_payload, "publish ", 8) == 0)
|
||||
&& (memcmp(&packet_payload[8], "SIP:", 4) == 0 || memcmp(&packet_payload[8], "sip:", 4) == 0)) {
|
||||
NDPI_LOG_INFO(ndpi_struct, "found sip PUBLISH\n");
|
||||
ndpi_int_sip_add_connection(ndpi_struct, flow, 0);
|
||||
return;
|
||||
}
|
||||
|
||||
if ((memcmp(packet_payload, "SUBSCRIBE ", 10) == 0 || memcmp(packet_payload, "subscribe ", 10) == 0)
|
||||
&& (memcmp(&packet_payload[10], "SIP:", 4) == 0 || memcmp(&packet_payload[10], "sip:", 4) == 0)) {
|
||||
NDPI_LOG_INFO(ndpi_struct, "found sip SUBSCRIBE\n");
|
||||
ndpi_int_sip_add_connection(ndpi_struct, flow, 0);
|
||||
return;
|
||||
}
|
||||
|
||||
/* SIP message extension RFC 3248 */
|
||||
if ((memcmp(packet_payload, "MESSAGE ", 8) == 0 || memcmp(packet_payload, "message ", 8) == 0)
|
||||
&& (memcmp(&packet_payload[8], "SIP:", 4) == 0 || memcmp(&packet_payload[8], "sip:", 4) == 0)) {
|
||||
NDPI_LOG_INFO(ndpi_struct, "found sip MESSAGE\n");
|
||||
ndpi_int_sip_add_connection(ndpi_struct, flow, 0);
|
||||
return;
|
||||
}
|
||||
|
||||
/* Courtesy of Miguel Quesada <mquesadab@gmail.com> */
|
||||
if ((memcmp(packet_payload, "OPTIONS ", 8) == 0
|
||||
|| memcmp(packet_payload, "options ", 8) == 0)
|
||||
|
||||
Reference in New Issue
Block a user