diff options
| -rw-r--r-- | python/ndpi.py | 22 | ||||
| -rw-r--r-- | python/ndpi_typestruct.py | 9 | ||||
| -rw-r--r-- | src/include/ndpi_typedefs.h | 21 |
3 files changed, 3 insertions, 49 deletions
diff --git a/python/ndpi.py b/python/ndpi.py index fb5c8af2c..7a57e1a39 100644 --- a/python/ndpi.py +++ b/python/ndpi.py @@ -442,9 +442,6 @@ struct ndpi_id_struct { /* NDPI_PROTOCOL_RTSP */ ndpi_ip_addr_t rtsp_ip_address; - /* NDPI_PROTOCOL_YAHOO */ - uint32_t yahoo_video_lan_timer; - /* NDPI_PROTOCOL_IRC_MAXPORT % 2 must be 0 */ /* NDPI_PROTOCOL_IRC */ #define NDPI_PROTOCOL_IRC_MAXPORT 8 @@ -478,20 +475,12 @@ struct ndpi_id_struct { uint16_t detected_directconnect_udp_port; uint16_t detected_directconnect_ssl_port; - /* NDPI_PROTOCOL_BITTORRENT */ -#define NDPI_BT_PORTS 8 - uint16_t bt_port_t[NDPI_BT_PORTS]; - uint16_t bt_port_u[NDPI_BT_PORTS]; - /* NDPI_PROTOCOL_UNENCRYPTED_JABBER */ #define JABBER_MAX_STUN_PORTS 6 uint16_t jabber_voice_stun_port[JABBER_MAX_STUN_PORTS]; uint16_t jabber_file_transfer_port[2]; /* NDPI_PROTOCOL_GNUTELLA */ - uint16_t detected_gnutella_port; - - /* NDPI_PROTOCOL_GNUTELLA */ uint16_t detected_gnutella_udp_port1; uint16_t detected_gnutella_udp_port2; @@ -504,16 +493,7 @@ struct ndpi_id_struct { /* NDPI_PROTOCOL_UNENCRYPTED_JABBER */ uint8_t jabber_voice_stun_used_ports; - /* NDPI_PROTOCOL_SIP */ - /* NDPI_PROTOCOL_YAHOO */ - uint32_t yahoo_video_lan_dir:1; - - /* NDPI_PROTOCOL_YAHOO */ - uint32_t yahoo_conf_logged_in:1; - uint32_t yahoo_voice_conf_logged_in:1; - - /* NDPI_PROTOCOL_RTSP */ - uint32_t rtsp_ts_set:1; + uint8_t rtsp_ts_set:1; }; struct ndpi_flow_tcp_struct { diff --git a/python/ndpi_typestruct.py b/python/ndpi_typestruct.py index 1944a5f3c..20f77120b 100644 --- a/python/ndpi_typestruct.py +++ b/python/ndpi_typestruct.py @@ -313,7 +313,6 @@ class NDPIIdStruct(Structure): _fields_ = [ ('detected_protocol_bitmask', NDPIProtocolBitMask), ('rtsp_ip_address', NDPIIpAddrT), - ('yahoo_video_lan_timer', c_uint32), ('irc_port', c_uint16 * 8), ('last_time_port_used', c_uint32 * 8), ('irc_ts', c_uint32), @@ -329,21 +328,15 @@ class NDPIIdStruct(Structure): ('detected_directconnect_port', c_uint16), ('detected_directconnect_udp_port', c_uint16), ('detected_directconnect_ssl_port', c_uint16), - ('bt_port_t', c_uint16 * 8), - ('bt_port_u', c_uint16 * 8), ('jabber_voice_stun_port', c_uint16 * 6), ('jabber_file_transfer_port', c_uint16 * 2), - ('detected_gnutella_port', c_uint16), ('detected_gnutella_udp_port1', c_uint16), ('detected_gnutella_udp_port2', c_uint16), ('soulseek_listen_port', c_uint16), ('irc_number_of_port', c_uint8), ('oscar_ssl_session_id', c_uint8 * 33), ('jabber_voice_stun_used_ports', c_uint8), - ('yahoo_video_lan_dir', c_uint32, 1), - ('yahoo_conf_logged_in', c_uint32, 1), - ('yahoo_voice_conf_logged_in', c_uint32, 1), - ('rtsp_ts_set', c_uint32, 1), + ('rtsp_ts_set', c_uint8, 1), ] diff --git a/src/include/ndpi_typedefs.h b/src/include/ndpi_typedefs.h index d11451ad1..dc5e49655 100644 --- a/src/include/ndpi_typedefs.h +++ b/src/include/ndpi_typedefs.h @@ -572,9 +572,6 @@ struct ndpi_id_struct { /* NDPI_PROTOCOL_RTSP */ ndpi_ip_addr_t rtsp_ip_address; - /* NDPI_PROTOCOL_YAHOO */ - u_int32_t yahoo_video_lan_timer; - /* NDPI_PROTOCOL_IRC_MAXPORT % 2 must be 0 */ /* NDPI_PROTOCOL_IRC */ #define NDPI_PROTOCOL_IRC_MAXPORT 8 @@ -608,20 +605,12 @@ struct ndpi_id_struct { u_int16_t detected_directconnect_udp_port; u_int16_t detected_directconnect_ssl_port; - /* NDPI_PROTOCOL_BITTORRENT */ -#define NDPI_BT_PORTS 8 - u_int16_t bt_port_t[NDPI_BT_PORTS]; - u_int16_t bt_port_u[NDPI_BT_PORTS]; - /* NDPI_PROTOCOL_JABBER */ #define JABBER_MAX_STUN_PORTS 6 u_int16_t jabber_voice_stun_port[JABBER_MAX_STUN_PORTS]; u_int16_t jabber_file_transfer_port[2]; /* NDPI_PROTOCOL_GNUTELLA */ - u_int16_t detected_gnutella_port; - - /* NDPI_PROTOCOL_GNUTELLA */ u_int16_t detected_gnutella_udp_port1; u_int16_t detected_gnutella_udp_port2; @@ -634,16 +623,8 @@ struct ndpi_id_struct { /* NDPI_PROTOCOL_JABBER */ u_int8_t jabber_voice_stun_used_ports; - /* NDPI_PROTOCOL_SIP */ - /* NDPI_PROTOCOL_YAHOO */ - u_int32_t yahoo_video_lan_dir:1; - - /* NDPI_PROTOCOL_YAHOO */ - u_int32_t yahoo_conf_logged_in:1; - u_int32_t yahoo_voice_conf_logged_in:1; - /* NDPI_PROTOCOL_RTSP */ - u_int32_t rtsp_ts_set:1; + u_int8_t rtsp_ts_set:1; }; /* ************************************************** */ |