Added Pragmatic General Multicast (PGM) protocol detection
This commit is contained in:
@@ -296,6 +296,7 @@
|
||||
#define NDPI_SCTP_PROTOCOL_TYPE 132
|
||||
#define NDPI_IPIP_PROTOCOL_TYPE 0x04
|
||||
#define NDPI_ICMPV6_PROTOCOL_TYPE 0x3a
|
||||
#define NDPI_PGM_PROTOCOL_TYPE 0x71
|
||||
|
||||
#define NDPI_ARRAY_LENGTH(array) (sizeof(array) / sizeof((array)[0]))
|
||||
|
||||
|
||||
@@ -324,6 +324,7 @@ typedef enum {
|
||||
NDPI_PROTOCOL_GOTO = 293, /* GoTo products, mainly GoToMeeting */
|
||||
NDPI_PROTOCOL_RSH = 294,
|
||||
NDPI_PROTOCOL_1KXUN = 295,
|
||||
NDPI_PROTOCOL_IP_PGM = 296,
|
||||
|
||||
#ifdef CUSTOM_NDPI_PROTOCOLS
|
||||
#include "../../../nDPI-custom/custom_ndpi_protocol_ids.h"
|
||||
|
||||
+7
-1
@@ -1294,6 +1294,10 @@ static void ndpi_init_protocol_defaults(struct ndpi_detection_module_struct *ndp
|
||||
"EGP", NDPI_PROTOCOL_CATEGORY_NETWORK,
|
||||
ndpi_build_default_ports(ports_a, 0, 0, 0, 0, 0) /* TCP */,
|
||||
ndpi_build_default_ports(ports_b, 0, 0, 0, 0, 0) /* UDP */);
|
||||
ndpi_set_proto_defaults(ndpi_str, 1 /* cleartext */, NDPI_PROTOCOL_ACCEPTABLE, NDPI_PROTOCOL_IP_PGM,
|
||||
"PGM", NDPI_PROTOCOL_CATEGORY_NETWORK,
|
||||
ndpi_build_default_ports(ports_a, 0, 0, 0, 0, 0) /* TCP */,
|
||||
ndpi_build_default_ports(ports_b, 0, 0, 0, 0, 0) /* UDP */);
|
||||
ndpi_set_proto_defaults(ndpi_str, 1 /* cleartext */, NDPI_PROTOCOL_ACCEPTABLE, NDPI_PROTOCOL_IP_SCTP,
|
||||
"SCTP", NDPI_PROTOCOL_CATEGORY_NETWORK,
|
||||
ndpi_build_default_ports(ports_a, 0, 0, 0, 0, 0) /* TCP */,
|
||||
@@ -3128,6 +3132,9 @@ u_int16_t ndpi_guess_protocol_id(struct ndpi_detection_module_struct *ndpi_str,
|
||||
case NDPI_GRE_PROTOCOL_TYPE:
|
||||
return(NDPI_PROTOCOL_IP_GRE);
|
||||
break;
|
||||
case NDPI_PGM_PROTOCOL_TYPE:
|
||||
return(NDPI_PROTOCOL_IP_PGM);
|
||||
break;
|
||||
case NDPI_ICMP_PROTOCOL_TYPE:
|
||||
if(flow) {
|
||||
flow->entropy = 0.0f;
|
||||
@@ -4942,7 +4949,6 @@ static int ndpi_init_packet(struct ndpi_detection_module_struct *ndpi_str,
|
||||
|
||||
/* ************************************************ */
|
||||
|
||||
|
||||
void ndpi_connection_tracking(struct ndpi_detection_module_struct *ndpi_str,
|
||||
struct ndpi_flow_struct *flow) {
|
||||
if(!flow) {
|
||||
|
||||
@@ -73,6 +73,10 @@ void ndpi_search_in_non_tcp_udp(struct ndpi_detection_module_struct
|
||||
set_protocol_and_bmask(NDPI_PROTOCOL_IP_SCTP);
|
||||
break;
|
||||
|
||||
case NDPI_PGM_PROTOCOL_TYPE:
|
||||
set_protocol_and_bmask(NDPI_PROTOCOL_IP_PGM);
|
||||
break;
|
||||
|
||||
case NDPI_OSPF_PROTOCOL_TYPE:
|
||||
set_protocol_and_bmask(NDPI_PROTOCOL_IP_OSPF);
|
||||
break;
|
||||
@@ -146,6 +150,14 @@ void init_non_tcp_udp_dissector(struct ndpi_detection_module_struct *ndpi_struct
|
||||
ADD_TO_DETECTION_BITMASK);
|
||||
*id += 1;
|
||||
|
||||
ndpi_set_bitmask_protocol_detection("IP_PGM", ndpi_struct, detection_bitmask, *id,
|
||||
NDPI_PROTOCOL_IP_PGM,
|
||||
ndpi_search_in_non_tcp_udp,
|
||||
NDPI_SELECTION_BITMASK_PROTOCOL_IPV4_OR_IPV6,
|
||||
NO_SAVE_DETECTION_BITMASK_AS_UNKNOWN,
|
||||
ADD_TO_DETECTION_BITMASK);
|
||||
*id += 1;
|
||||
|
||||
ndpi_set_bitmask_protocol_detection("IP_OSPF", ndpi_struct, detection_bitmask, *id,
|
||||
NDPI_PROTOCOL_IP_OSPF,
|
||||
ndpi_search_in_non_tcp_udp,
|
||||
|
||||
Reference in New Issue
Block a user