diff options
| author | Toni Uhlig <matzeton@googlemail.com> | 2021-03-20 14:40:23 +0100 |
|---|---|---|
| committer | Toni Uhlig <matzeton@googlemail.com> | 2021-03-20 14:40:23 +0100 |
| commit | 6f279690573200f1cc6d7e518dd301f163845806 (patch) | |
| tree | e09fc4a6cf5969b8bf625c5b7cda3d3c9b95ffb0 /src/include | |
| parent | ce971e354e62aee65ab268020a505e03619cf6be (diff) | |
Removed master protocol as it was only used for STUN and via also removed API function ndpi_get_protocol_id_master_protofix/ndpi-subprotocol-detection-and-refactoring
* Adjusted Python code to conform to the changes made during the refactoring process.
Signed-off-by: Toni Uhlig <matzeton@googlemail.com>
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/ndpi_main.h | 10 | ||||
| -rw-r--r-- | src/include/ndpi_typedefs.h | 4 |
2 files changed, 3 insertions, 11 deletions
diff --git a/src/include/ndpi_main.h b/src/include/ndpi_main.h index eeba5c37d..db637ca66 100644 --- a/src/include/ndpi_main.h +++ b/src/include/ndpi_main.h @@ -103,9 +103,7 @@ extern "C" { int protoId, ...); extern void ndpi_set_proto_defaults(struct ndpi_detection_module_struct *ndpi_mod, - ndpi_protocol_breed_t protoBreed, u_int16_t protoId, - u_int16_t tcp_alias_protoId[2], - u_int16_t udp_alias_protoId[2], char *protoName, + ndpi_protocol_breed_t protoBreed, u_int16_t protoId, char *protoName, ndpi_protocol_category_t protoCategory, ndpi_port_range *tcpDefPorts, ndpi_port_range *udpDefPorts); @@ -133,11 +131,7 @@ extern "C" { extern u_int8_t ndpi_is_proto(ndpi_protocol proto, u_int16_t p); extern u_int16_t ndpi_get_lower_proto(ndpi_protocol p); - extern int ndpi_get_protocol_id_master_proto(struct ndpi_detection_module_struct *ndpi_struct, - u_int16_t protocol_id, - u_int16_t** tcp_master_proto, - u_int16_t** udp_master_proto); - #/* NDPI_PROTOCOL_NETBIOS */ + /* NDPI_PROTOCOL_NETBIOS */ int ndpi_netbios_name_interpret(char *in, size_t inlen, char *out, u_int out_len); #ifdef NDPI_ENABLE_DEBUG_MESSAGES diff --git a/src/include/ndpi_typedefs.h b/src/include/ndpi_typedefs.h index ec9e17eef..30a3b04b4 100644 --- a/src/include/ndpi_typedefs.h +++ b/src/include/ndpi_typedefs.h @@ -843,7 +843,6 @@ struct ndpi_packet_struct { u_int64_t current_time_ms; u_int16_t detected_protocol_stack[NDPI_PROTOCOL_SIZE]; - u_int8_t detected_subprotocol_stack[NDPI_PROTOCOL_SIZE]; u_int16_t protocol_stack_info; struct ndpi_int_one_line_struct line[NDPI_MAX_PARSE_LINES_PER_PACKET]; @@ -1006,9 +1005,8 @@ typedef struct ndpi_proto_defaults { char *protoName; ndpi_protocol_category_t protoCategory; u_int16_t * subprotocols; - size_t subprotocol_count; + u_int32_t subprotocol_count; u_int16_t protoId, protoIdx; - u_int16_t master_tcp_protoId[2], master_udp_protoId[2]; /* The main protocols on which this sub-protocol sits on */ u_int16_t tcp_default_ports[MAX_DEFAULT_PORTS], udp_default_ports[MAX_DEFAULT_PORTS]; ndpi_protocol_breed_t protoBreed; void (*func) (struct ndpi_detection_module_struct *, struct ndpi_flow_struct *flow); |