Add realtime protocol output to ndpiReader. (#2197)
* support for using a new flow callback invoked before the flow memory is free'd * minor fixes Signed-off-by: Toni Uhlig <matzeton@googlemail.com>
This commit is contained in:
@@ -290,14 +290,15 @@
|
||||
ndpi_parse_packet_line_info(ndpi_struct,flow); \
|
||||
} \
|
||||
|
||||
#define NDPI_IPSEC_PROTOCOL_ESP 50
|
||||
#define NDPI_IPSEC_PROTOCOL_AH 51
|
||||
#define NDPI_GRE_PROTOCOL_TYPE 0x2F
|
||||
#define NDPI_ICMP_PROTOCOL_TYPE 0x01
|
||||
#define NDPI_IGMP_PROTOCOL_TYPE 0x02
|
||||
#define NDPI_EGP_PROTOCOL_TYPE 0x08
|
||||
#define NDPI_OSPF_PROTOCOL_TYPE 0x59
|
||||
#define NDPI_SCTP_PROTOCOL_TYPE 132
|
||||
#define NDPI_IPSEC_PROTOCOL_ESP 50
|
||||
#define NDPI_IPSEC_PROTOCOL_AH 51
|
||||
#define NDPI_GRE_PROTOCOL_TYPE 0x2F
|
||||
#define NDPI_ICMP_PROTOCOL_TYPE 0x01
|
||||
#define NDPI_IGMP_PROTOCOL_TYPE 0x02
|
||||
#define NDPI_EGP_PROTOCOL_TYPE 0x08
|
||||
#define NDPI_OSPF_PROTOCOL_TYPE 0x59
|
||||
#define NDPI_VRRP_PROTOCOL_TYPE 112
|
||||
#define NDPI_SCTP_PROTOCOL_TYPE 132
|
||||
#define NDPI_IPIP_PROTOCOL_TYPE 0x04
|
||||
#define NDPI_ICMPV6_PROTOCOL_TYPE 0x3a
|
||||
#define NDPI_PGM_PROTOCOL_TYPE 0x71
|
||||
|
||||
+1
-1
@@ -4138,7 +4138,7 @@ static u_int16_t guess_protocol_id(struct ndpi_detection_module_struct *ndpi_str
|
||||
}
|
||||
}
|
||||
return(NDPI_PROTOCOL_IP_ICMPV6);
|
||||
case 112:
|
||||
case NDPI_VRRP_PROTOCOL_TYPE:
|
||||
return(NDPI_PROTOCOL_IP_VRRP);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1569,7 +1569,7 @@ char *ndpi_get_ip_proto_name(u_int16_t ip_proto, char *name, unsigned int name_l
|
||||
snprintf(name, name_len, "PIM");
|
||||
break;
|
||||
|
||||
case 112:
|
||||
case NDPI_VRRP_PROTOCOL_TYPE:
|
||||
snprintf(name, name_len, "VRRP");
|
||||
break;
|
||||
|
||||
@@ -2849,7 +2849,7 @@ int ndpi_vsnprintf(char * str, size_t size, char const * format, va_list va_args
|
||||
struct tm *ndpi_gmtime_r(const time_t *timep,
|
||||
struct tm *result)
|
||||
{
|
||||
#ifdef WIN32
|
||||
#if defined(WIN32)
|
||||
gmtime_s(result, timep);
|
||||
return result;
|
||||
#else
|
||||
|
||||
Reference in New Issue
Block a user