diff options
| author | Toni <matzeton@googlemail.com> | 2024-01-09 00:39:59 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-09 00:39:59 +0100 |
| commit | 6c3d162cd6d3f884b634397d63cea180b1e8f721 (patch) | |
| tree | 604db58c872b736b97402ac1ef29891e83c2d96f /src | |
| parent | 90b999e3f1a67babbcd7003fb0ccab005d45f343 (diff) | |
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>
Diffstat (limited to 'src')
| -rw-r--r-- | src/include/ndpi_define.h.in | 17 | ||||
| -rw-r--r-- | src/lib/ndpi_main.c | 2 | ||||
| -rw-r--r-- | src/lib/ndpi_utils.c | 4 |
3 files changed, 12 insertions, 11 deletions
diff --git a/src/include/ndpi_define.h.in b/src/include/ndpi_define.h.in index 4d61d7130..3a5585f12 100644 --- a/src/include/ndpi_define.h.in +++ b/src/include/ndpi_define.h.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 diff --git a/src/lib/ndpi_main.c b/src/lib/ndpi_main.c index 2d258b46a..253becadd 100644 --- a/src/lib/ndpi_main.c +++ b/src/lib/ndpi_main.c @@ -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); } } diff --git a/src/lib/ndpi_utils.c b/src/lib/ndpi_utils.c index dd5067906..67b2d92e8 100644 --- a/src/lib/ndpi_utils.c +++ b/src/lib/ndpi_utils.c @@ -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 |