diff options
Diffstat (limited to 'python')
| -rw-r--r-- | python/ndpi.py | 18 | ||||
| -rw-r--r-- | python/ndpi_typestruct.py | 12 |
2 files changed, 0 insertions, 30 deletions
diff --git a/python/ndpi.py b/python/ndpi.py index 039f222ae..1d5d9447a 100644 --- a/python/ndpi.py +++ b/python/ndpi.py @@ -849,12 +849,9 @@ typedef struct ndpi_proto { struct ndpi_detection_module_struct { NDPI_PROTOCOL_BITMASK detection_bitmask; - NDPI_PROTOCOL_BITMASK generic_http_packet_bitmask; uint32_t current_ts; - uint32_t ticks_per_second; - uint16_t num_tls_blocks_to_follow; char custom_category_labels[NUM_CUSTOM_CATEGORIES][CUSTOM_CATEGORY_LABEL_LEN]; @@ -881,8 +878,6 @@ struct ndpi_detection_module_struct { /* misc parameters */ uint32_t tcp_max_retransmission_window_size; - uint32_t directconnect_connection_ip_tick_timeout; - /* subprotocol registration handler */ struct ndpi_subprotocol_conf_struct subprotocol_conf[250]; @@ -903,20 +898,7 @@ struct ndpi_detection_module_struct { /* IP-based protocol detection */ void *protocols_ptree; - /* irc parameters */ - uint32_t irc_timeout; - /* gnutella parameters */ - uint32_t gnutella_timeout; - /* rstp */ - uint32_t jabber_stun_timeout; - uint32_t jabber_file_transfer_timeout; uint8_t ip_version_limit; - /* NDPI_PROTOCOL_BITTORRENT */ - struct hash_ip4p_table *bt_ht; - struct hash_ip4p_table *bt6_ht; - /* BT_ANNOUNCE */ - struct bt_announce *bt_ann; - int bt_ann_len; /* NDPI_PROTOCOL_OOKLA */ struct ndpi_lru_cache *ookla_cache; diff --git a/python/ndpi_typestruct.py b/python/ndpi_typestruct.py index 2ba626bc8..7ff561d4e 100644 --- a/python/ndpi_typestruct.py +++ b/python/ndpi_typestruct.py @@ -227,9 +227,7 @@ class CustomCategories(Structure): NDPIDetectionModuleStruct._fields_ = [ ("detection_bitmask", NDPIProtocolBitMask), - ("generic_http_packet_bitmask", NDPIProtocolBitMask), ("current_ts", c_uint32), - ("ticks_per_second", c_uint32), ("custom_category_labels", (c_char * ndpi.ndpi_wrap_num_custom_categories()) * ndpi.ndpi_wrap_custom_category_label_len()), ("callback_buffer", NDPICallFunctionStruct * (ndpi.ndpi_wrap_ndpi_max_supported_protocols() + 1)), @@ -246,7 +244,6 @@ NDPIDetectionModuleStruct._fields_ = [ ("udpRoot", POINTER(NDPIDefaultsPortsTreeNodeT)), ("ndpi_log_level", c_uint), ("tcp_max_retransmission_window_size", c_uint32), - ("directconnect_connection_ip_tick_timeout", c_uint32), ("subprotocol_conf", NDPISubprotocolConfStruct * (ndpi.ndpi_wrap_ndpi_max_supported_protocols() + 1)), ("ndpi_num_supported_protocols", c_uint), ("ndpi_num_custom_protocols", c_uint), @@ -255,16 +252,7 @@ NDPIDetectionModuleStruct._fields_ = [ ("impossible_bigrams_automa", NDPIAutoma), ("custom_categories", CustomCategories), ("protocols_ptree", c_void_p), - ("irc_timeout", c_uint32), - ("gnutella_timeout", c_uint32), - ("zattoo_connection_timeout", c_uint32), - ("jabber_stun_timeout", c_uint32), - ("jabber_file_transfer_timeout", c_uint32), ("ip_version_limit", c_uint8), - ("bt_ht", POINTER(HashIp4pTable)), - ("bt6_ht", POINTER(HashIp4pTable)), - ("bt_ann", POINTER(BtAnnounce)), - ("bt_ann_len", c_int), ("ookla_cache", POINTER(NDPILruCache)), ("tinc_cache", POINTER(Cache)), ("proto_defaults", NDPIProtoDefaultsT * (ndpi.ndpi_wrap_ndpi_max_supported_protocols() + |