Merge pull request #770 from ntop/ndpi_icmp

Add icmp and icmp6 to calculate splt and bd values.
This commit is contained in:
Luca Deri
2019-09-29 07:59:02 +02:00
committed by GitHub
4 changed files with 57 additions and 11 deletions
+1
View File
@@ -87,6 +87,7 @@ unsigned int ndpi_timer_lt(const struct timeval *a, const struct timeval *b);
void ndpi_timer_sub(const struct timeval *a, const struct timeval *b, struct timeval *result);
void ndpi_timer_clear(struct timeval *a);
unsigned int ndpi_timeval_to_milliseconds(struct timeval ts);
unsigned int ndpi_timeval_to_microseconds(struct timeval ts);
void ndpi_log_timestamp(char *log_ts, u_int log_ts_len);
#endif /* NDPI_CLASSIFY_H */
+14
View File
@@ -348,6 +348,20 @@ struct ndpi_icmphdr {
} un;
} PACK_OFF;
/* +++++++++++++++++++++++ ICMP6 header +++++++++++++++++++++++ */
PACK_ON
struct ndpi_icmp6hdr {
uint8_t icmp6_type; /* type field */
uint8_t icmp6_code; /* code field */
uint16_t icmp6_cksum; /* checksum field */
union {
uint32_t icmp6_un_data32[1]; /* type-specific field */
uint16_t icmp6_un_data16[2]; /* type-specific field */
uint8_t icmp6_un_data8[4]; /* type-specific field */
} icmp6_dataun;
} PACK_OFF;
/* +++++++++++++++++++++++ VXLAN header +++++++++++++++++++++++ */
PACK_ON