diff options
| author | lns <matzeton@googlemail.com> | 2022-08-05 21:26:54 +0200 |
|---|---|---|
| committer | lns <matzeton@googlemail.com> | 2022-08-08 18:22:40 +0200 |
| commit | 9939b5c30775993941a4b9afe01ddc36434afbf1 (patch) | |
| tree | 6084e87015382a703fcd8b5536511d9d0728ad3e /src/include | |
| parent | 523360001e4c9e64d875febd9f024daa2691c31a (diff) | |
Add TiVoConnect dissector. Fixes #1697.add/tivoconnect
* added static assert if supported, to complain if the flow struct changes
Signed-off-by: lns <matzeton@googlemail.com>
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/ndpi_protocol_ids.h | 1 | ||||
| -rw-r--r-- | src/include/ndpi_protocols.h | 1 | ||||
| -rw-r--r-- | src/include/ndpi_typedefs.h | 18 |
3 files changed, 20 insertions, 0 deletions
diff --git a/src/include/ndpi_protocol_ids.h b/src/include/ndpi_protocol_ids.h index a2c8cd317..bad450d34 100644 --- a/src/include/ndpi_protocol_ids.h +++ b/src/include/ndpi_protocol_ids.h @@ -336,6 +336,7 @@ typedef enum { NDPI_PROTOCOL_THREEMA = 305, NDPI_PROTOCOL_ALICLOUD = 306, NDPI_PROTOCOL_AVAST = 307, + NDPI_PROTOCOL_TIVOCONNECT = 308, #ifdef CUSTOM_NDPI_PROTOCOLS #include "../../../nDPI-custom/custom_ndpi_protocol_ids.h" diff --git a/src/include/ndpi_protocols.h b/src/include/ndpi_protocols.h index 7087b0231..98a860a24 100644 --- a/src/include/ndpi_protocols.h +++ b/src/include/ndpi_protocols.h @@ -237,6 +237,7 @@ void init_avast_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_in void init_softether_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask); void init_activision_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask); void init_discord_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask); +void init_tivoconnect_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 e8b688aee..502c7fe12 100644 --- a/src/include/ndpi_typedefs.h +++ b/src/include/ndpi_typedefs.h @@ -1447,6 +1447,13 @@ struct ndpi_flow_struct { u_int8_t primitive; /* GET, SET... */ u_int8_t error_status; } snmp; + + struct { + char identity_uuid[36]; + char machine[48]; + char platform[32]; + char services[48]; + } tivoconnect; } protos; /*** ALL protocol specific 64 bit variables here ***/ @@ -1524,6 +1531,17 @@ struct ndpi_flow_struct { u_int8_t priv_data[16]; }; +#if !defined(NDPI_CFFI_PREPROCESSING) && defined(__linux__) +#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L +_Static_assert(sizeof(((struct ndpi_flow_struct *)0)->protos) <= 200, + "Size of the struct member protocols increased to more than 200 bytes, " + "please check if this change is necessary."); +_Static_assert(sizeof(struct ndpi_flow_struct) <= 904, + "Size of the flow struct increased to more than 904 bytes, " + "please check if this change is necessary."); +#endif +#endif + #define NDPI_PROTOCOL_DEFAULT_LEVEL 0 typedef struct { |