diff options
| author | lns <matzeton@googlemail.com> | 2022-07-28 19:59:15 +0200 |
|---|---|---|
| committer | lns <matzeton@googlemail.com> | 2022-07-29 18:24:42 +0200 |
| commit | 8358107a9b5760b6dc9cea84c658a5d2be02c2ff (patch) | |
| tree | 9dcd51e78edaa9eb1d41149242ba37fe2eb9811d /src/include | |
| parent | 405a52ed65c0b641b26f0571bf6a6c369c5251d7 (diff) | |
Add Softether dissector.add/softether-dissector
Signed-off-by: lns <matzeton@googlemail.com>
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/ndpi_define.h.in | 4 | ||||
| -rw-r--r-- | src/include/ndpi_protocols.h | 1 | ||||
| -rw-r--r-- | src/include/ndpi_typedefs.h | 7 |
3 files changed, 10 insertions, 2 deletions
diff --git a/src/include/ndpi_define.h.in b/src/include/ndpi_define.h.in index e591f3eda..5c552c0d7 100644 --- a/src/include/ndpi_define.h.in +++ b/src/include/ndpi_define.h.in @@ -390,9 +390,9 @@ static inline u_int64_t get_u_int64_t(const u_int8_t* X, int O) #define htole32(x) (x) #define be32toh(x) ntohl(x) #define le32toh(x) (x) -#define htobe64(x) htonll(x) +#define htobe64(x) ndpi_htonll(x) #define htole64(x) (x) -#define be64toh(x) ntohll(x) +#define be64toh(x) ndpi_ntohll(x) #define le64toh(x) (x) #elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__ diff --git a/src/include/ndpi_protocols.h b/src/include/ndpi_protocols.h index ebd88a837..f674b2849 100644 --- a/src/include/ndpi_protocols.h +++ b/src/include/ndpi_protocols.h @@ -234,6 +234,7 @@ void init_ultrasurf_dissector(struct ndpi_detection_module_struct *ndpi_struct, void init_threema_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask); void init_alicloud_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask); void init_avast_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask); +void init_softether_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask); /* ndpi_main.c */ extern u_int32_t ndpi_ip_port_hash_funct(u_int32_t ip, u_int16_t port); diff --git a/src/include/ndpi_typedefs.h b/src/include/ndpi_typedefs.h index f5fccfd56..24302075e 100644 --- a/src/include/ndpi_typedefs.h +++ b/src/include/ndpi_typedefs.h @@ -1362,6 +1362,13 @@ struct ndpi_flow_struct { } kerberos; struct { + char ip[16]; + char port[6]; + char hostname[48]; + char fqdn[48]; + } softether; + + struct { char *server_names, *alpn, *tls_supported_versions, *issuerDN, *subjectDN; u_int32_t notBefore, notAfter; char ja3_client[33], ja3_server[33]; |