Rename Jabber detection name as we are not sure if it is unencrypted e.g. if START_TLS used. (#1079)
Signed-off-by: Toni Uhlig <matzeton@googlemail.com>
This commit is contained in:
@@ -96,7 +96,7 @@ typedef enum {
|
||||
NDPI_PROTOCOL_PS_VUE = 64,
|
||||
NDPI_PROTOCOL_IRC = 65,
|
||||
NDPI_PROTOCOL_AYIYA = 66,
|
||||
NDPI_PROTOCOL_UNENCRYPTED_JABBER = 67,
|
||||
NDPI_PROTOCOL_JABBER = 67,
|
||||
NDPI_PROTOCOL_NATS = 68,
|
||||
NDPI_PROTOCOL_AMONG_US = 69, /* Toni Uhlig <matzeton@googlemail.com> */
|
||||
NDPI_PROTOCOL_YAHOO = 70,
|
||||
|
||||
@@ -538,7 +538,7 @@ struct ndpi_id_struct {
|
||||
/* NDPI_PROTOCOL_ZATTOO */
|
||||
u_int32_t zattoo_ts;
|
||||
|
||||
/* NDPI_PROTOCOL_UNENCRYPTED_JABBER */
|
||||
/* NDPI_PROTOCOL_JABBER */
|
||||
u_int32_t jabber_stun_or_ft_ts;
|
||||
|
||||
/* NDPI_PROTOCOL_DIRECTCONNECT */
|
||||
@@ -557,7 +557,7 @@ struct ndpi_id_struct {
|
||||
u_int16_t bt_port_t[NDPI_BT_PORTS];
|
||||
u_int16_t bt_port_u[NDPI_BT_PORTS];
|
||||
|
||||
/* NDPI_PROTOCOL_UNENCRYPTED_JABBER */
|
||||
/* 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];
|
||||
@@ -575,7 +575,7 @@ struct ndpi_id_struct {
|
||||
/* NDPI_PROTOCOL_IRC */
|
||||
u_int8_t irc_number_of_port;
|
||||
|
||||
/* NDPI_PROTOCOL_UNENCRYPTED_JABBER */
|
||||
/* NDPI_PROTOCOL_JABBER */
|
||||
u_int8_t jabber_voice_stun_used_ports;
|
||||
|
||||
/* NDPI_PROTOCOL_SIP */
|
||||
|
||||
+2
-2
@@ -961,8 +961,8 @@ static void ndpi_init_protocol_defaults(struct ndpi_detection_module_struct *ndp
|
||||
no_master, no_master, "Ayiya", NDPI_PROTOCOL_CATEGORY_NETWORK,
|
||||
ndpi_build_default_ports(ports_a, 0, 0, 0, 0, 0) /* TCP */,
|
||||
ndpi_build_default_ports(ports_b, 5072, 0, 0, 0, 0) /* UDP */);
|
||||
ndpi_set_proto_defaults(ndpi_str, NDPI_PROTOCOL_ACCEPTABLE, NDPI_PROTOCOL_UNENCRYPTED_JABBER,
|
||||
0 /* can_have_a_subprotocol */, no_master, no_master, "Unencrypted_Jabber",
|
||||
ndpi_set_proto_defaults(ndpi_str, NDPI_PROTOCOL_ACCEPTABLE, NDPI_PROTOCOL_JABBER,
|
||||
0 /* can_have_a_subprotocol */, no_master, no_master, "Jabber",
|
||||
NDPI_PROTOCOL_CATEGORY_WEB, ndpi_build_default_ports(ports_a, 0, 0, 0, 0, 0) /* TCP */,
|
||||
ndpi_build_default_ports(ports_b, 0, 0, 0, 0, 0) /* UDP */);
|
||||
ndpi_set_proto_defaults(ndpi_str, NDPI_PROTOCOL_FUN, NDPI_PROTOCOL_DISNEYPLUS, 0 /* can_have_a_subprotocol */,
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
|
||||
#include "ndpi_protocol_ids.h"
|
||||
|
||||
#define NDPI_CURRENT_PROTO NDPI_PROTOCOL_UNENCRYPTED_JABBER
|
||||
#define NDPI_CURRENT_PROTO NDPI_PROTOCOL_JABBER
|
||||
|
||||
#include "ndpi_api.h"
|
||||
|
||||
@@ -93,7 +93,7 @@ void ndpi_search_jabber_tcp(struct ndpi_detection_module_struct *ndpi_struct, st
|
||||
NDPI_LOG_INFO(ndpi_struct, "found jabber file transfer\n");
|
||||
|
||||
ndpi_int_jabber_add_connection(ndpi_struct, flow,
|
||||
NDPI_PROTOCOL_UNENCRYPTED_JABBER);
|
||||
NDPI_PROTOCOL_JABBER);
|
||||
}
|
||||
}
|
||||
if (dst != NULL && dst->jabber_file_transfer_port[0] != 0) {
|
||||
@@ -113,7 +113,7 @@ void ndpi_search_jabber_tcp(struct ndpi_detection_module_struct *ndpi_struct, st
|
||||
NDPI_LOG_INFO(ndpi_struct, "found jabber file transfer\n");
|
||||
|
||||
ndpi_int_jabber_add_connection(ndpi_struct, flow,
|
||||
NDPI_PROTOCOL_UNENCRYPTED_JABBER);
|
||||
NDPI_PROTOCOL_JABBER);
|
||||
}
|
||||
}
|
||||
return;
|
||||
@@ -125,7 +125,7 @@ void ndpi_search_jabber_tcp(struct ndpi_detection_module_struct *ndpi_struct, st
|
||||
|
||||
|
||||
/* this part parses a packet and searches for port=. it works asymmetrically. */
|
||||
if (packet->detected_protocol_stack[0] == NDPI_PROTOCOL_UNENCRYPTED_JABBER) {
|
||||
if (packet->detected_protocol_stack[0] == NDPI_PROTOCOL_JABBER) {
|
||||
u_int16_t lastlen;
|
||||
u_int16_t j_port = 0;
|
||||
/* check for google jabber voip connections ... */
|
||||
@@ -270,7 +270,7 @@ void ndpi_search_jabber_tcp(struct ndpi_detection_module_struct *ndpi_struct, st
|
||||
|| ndpi_strnstr((const char *)&packet->payload[13], "xmlns:stream=\"http://etherx.jabber.org/streams\"", start)) {
|
||||
|
||||
/* Protocol family */
|
||||
ndpi_int_jabber_add_connection(ndpi_struct, flow, NDPI_PROTOCOL_UNENCRYPTED_JABBER);
|
||||
ndpi_int_jabber_add_connection(ndpi_struct, flow, NDPI_PROTOCOL_JABBER);
|
||||
|
||||
/* search for subprotocols */
|
||||
check_content_type_and_change_protocol(ndpi_struct, flow, 13);
|
||||
@@ -292,8 +292,8 @@ void ndpi_search_jabber_tcp(struct ndpi_detection_module_struct *ndpi_struct, st
|
||||
|
||||
void init_jabber_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask)
|
||||
{
|
||||
ndpi_set_bitmask_protocol_detection("Unencrypted_Jabber", ndpi_struct, detection_bitmask, *id,
|
||||
NDPI_PROTOCOL_UNENCRYPTED_JABBER,
|
||||
ndpi_set_bitmask_protocol_detection("Jabber", ndpi_struct, detection_bitmask, *id,
|
||||
NDPI_PROTOCOL_JABBER,
|
||||
ndpi_search_jabber_tcp,
|
||||
NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_OR_UDP_WITHOUT_RETRANSMISSION,
|
||||
SAVE_DETECTION_BITMASK_AS_UNKNOWN,
|
||||
|
||||
Reference in New Issue
Block a user