diff options
Diffstat (limited to 'python')
| -rw-r--r-- | python/ndpi.py | 19 | ||||
| -rw-r--r-- | python/ndpi_typestruct.py | 20 |
2 files changed, 23 insertions, 16 deletions
diff --git a/python/ndpi.py b/python/ndpi.py index 3eea870e2..a567d789b 100644 --- a/python/ndpi.py +++ b/python/ndpi.py @@ -645,6 +645,14 @@ struct ndpi_flow_udp_struct { /* NDPI_PROTOCOL_WIREGUARD */ uint8_t wireguard_stage; uint32_t wireguard_peer_index[2]; + + /* NDPI_PROTOCOL_QUIC */ + u_int8_t *quic_reasm_buf; + u_int32_t quic_reasm_buf_len; + + /* NDPI_PROTOCOL_CSGO */ + uint8_t csgo_strid[18],csgo_state,csgo_s2; + uint32_t csgo_id2; }; struct ndpi_int_one_line_struct { @@ -941,6 +949,9 @@ struct ndpi_detection_module_struct { uint8_t direction_detect_disable:1, /* disable internal detection of packet direction */ _pad:7; + + /* Current packet */ + struct ndpi_packet_struct packet; }; #define NDPI_CIPHER_SAFE 0 @@ -1163,15 +1174,13 @@ struct ndpi_flow_struct { uint8_t ovpn_session_id[8]; uint8_t ovpn_counter; + /* Flow key used to search a match into the mining cache */ + u_int32_t key_mining_cache; + /* NDPI_PROTOCOL_TINC */ uint8_t tinc_state; struct tinc_cache_entry tinc_cache_entry; - /* NDPI_PROTOCOL_CSGO */ - uint8_t csgo_strid[18],csgo_state,csgo_s2; - uint32_t csgo_id2; - /* internal structures to save functions calls */ - struct ndpi_packet_struct packet; struct ndpi_id_struct *src; struct ndpi_id_struct *dst; }; diff --git a/python/ndpi_typestruct.py b/python/ndpi_typestruct.py index a0bdcee84..179cc7def 100644 --- a/python/ndpi_typestruct.py +++ b/python/ndpi_typestruct.py @@ -276,11 +276,9 @@ NDPIDetectionModuleStruct._fields_ = [ ("tinc_cache", POINTER(Cache)), ("proto_defaults", NDPIProtoDefaultsT * (ndpi.ndpi_wrap_ndpi_max_supported_protocols() + ndpi.ndpi_wrap_ndpi_max_num_custom_protocols())), - ("http_dont_dissect_response", c_uint8, 1), - ("dns_dont_dissect_response", c_uint8, 1), ("direction_detect_disable", c_uint8, 1), - ("disable_metadata_export", c_uint8, 1), - ("hyperscan", c_void_p) + ('_pad', c_uint8, 7), + ('packet', NDPIPacketStruct), ] @@ -408,6 +406,12 @@ class NDPIFlowUdpStruct(Structure): ('memcached_matches', c_uint8), ('wireguard_stage', c_uint8), ('wireguard_peer_index', c_uint32 * 2), + ('quic_reasm_buf', POINTER(c_uint8)), + ('quic_reasm_buf_len', c_uint32), + ('csgo_strid', c_uint8 * 18), + ('csgo_state', c_uint8), + ('csgo_s2', c_uint8), + ('csgo_id2', c_uint32), ] @@ -735,15 +739,9 @@ NDPIFlowStruct._fields_ = [ ('starcraft_udp_stage', c_uint8, 3), ('ovpn_session_id', c_uint8 * 8), ('ovpn_counter', c_uint8), + ('key_mining_cache', c_uint32), ('tinc_state', c_uint8), ('TincCacheEntry', TincCacheEntry), - ('csgo_strid', c_uint8 * 18), - ('csgo_state', c_uint8), - ('csgo_s2', c_uint8), - ('csgo_id2', c_uint32), - ('kxun_counter', c_uint16), - ('iqiyi_counter', c_uint16), - ('packet', NDPIPacketStruct), ('src', POINTER(NDPIIdStruct)), ('dst', POINTER(NDPIIdStruct)) ] |