Added OICQ dissector. (#1950)

Signed-off-by: lns <matzeton@googlemail.com>
Signed-off-by: Toni Uhlig <matzeton@googlemail.com>
This commit is contained in:
Toni
2023-04-21 11:30:10 +02:00
committed by GitHub
parent ba99330031
commit 85751ba9d7
67 changed files with 227 additions and 62 deletions
+1
View File
@@ -363,6 +363,7 @@ typedef enum {
NDPI_PROTOCOL_TPLINK_SHP = 332, /* TP-LINK Smart Home Protocol */
NDPI_PROTOCOL_SOURCE_ENGINE = 333,
NDPI_PROTOCOL_BACNET = 334,
NDPI_PROTOCOL_OICQ = 335,
#ifdef CUSTOM_NDPI_PROTOCOLS
+1
View File
@@ -238,6 +238,7 @@ void init_merakicloud_dissector(struct ndpi_detection_module_struct *ndpi_struct
void init_tailscale_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id);
void init_source_engine_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id);
void init_bacnet_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id);
void init_oicq_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id);
/* ndpi_main.c */
extern u_int32_t ndpi_ip_port_hash_funct(u_int32_t ip, u_int16_t port);
+7
View File
@@ -2060,6 +2060,10 @@ static void ndpi_init_protocol_defaults(struct ndpi_detection_module_struct *ndp
"BACnet", NDPI_PROTOCOL_CATEGORY_IOT_SCADA,
ndpi_build_default_ports(ports_a, 0, 0, 0, 0, 0) /* TCP */,
ndpi_build_default_ports(ports_b, 47808, 0, 0, 0, 0) /* UDP */);
ndpi_set_proto_defaults(ndpi_str, 1 /* cleartext */, 0 /* nw proto */, NDPI_PROTOCOL_ACCEPTABLE, NDPI_PROTOCOL_OICQ,
"OICQ", NDPI_PROTOCOL_CATEGORY_CHAT,
ndpi_build_default_ports(ports_a, 0, 0, 0, 0, 0) /* TCP */,
ndpi_build_default_ports(ports_b, 8000, 0, 0, 0, 0) /* UDP */);
#ifdef CUSTOM_NDPI_PROTOCOLS
@@ -4899,6 +4903,9 @@ static int ndpi_callback_init(struct ndpi_detection_module_struct *ndpi_str) {
/* BACnet */
init_bacnet_dissector(ndpi_str, &a);
/* OICQ */
init_oicq_dissector(ndpi_str, &a);
#ifdef CUSTOM_NDPI_PROTOCOLS
#include "../../../nDPI-custom/custom_ndpi_main_init.c"
#endif
+102
View File
@@ -0,0 +1,102 @@
/*
* oicq.c
*
* OICQ / Tencent QQ
*
* Copyright (C) 2023 - ntop.org
*
* nDPI is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* nDPI is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with nDPI. If not, see <http://www.gnu.org/licenses/>.
*
*/
#include "ndpi_protocol_ids.h"
#define NDPI_CURRENT_PROTO NDPI_PROTOCOL_OICQ
#include "ndpi_api.h"
PACK_ON
struct oicq_hdr {
uint8_t flag;
uint16_t version;
uint16_t command;
uint16_t sequence;
} PACK_OFF;
static void ndpi_int_oicq_add_connection(struct ndpi_detection_module_struct * const ndpi_struct,
struct ndpi_flow_struct * const flow)
{
NDPI_LOG_INFO(ndpi_struct, "found OICQ\n");
ndpi_set_detected_protocol(ndpi_struct, flow,
NDPI_PROTOCOL_OICQ,
NDPI_PROTOCOL_UNKNOWN,
NDPI_CONFIDENCE_DPI);
}
/* ***************************************************** */
static void ndpi_search_oicq(struct ndpi_detection_module_struct *ndpi_struct,
struct ndpi_flow_struct *flow)
{
struct ndpi_packet_struct const * const packet = &ndpi_struct->packet;
struct oicq_hdr const * const hdr = (struct oicq_hdr *)&packet->payload[0];
NDPI_LOG_DBG(ndpi_struct, "search OICQ\n");
if (packet->payload_packet_len < sizeof(*hdr))
{
NDPI_EXCLUDE_PROTO(ndpi_struct, flow);
return;
}
if (hdr->flag != 0x02)
{
NDPI_EXCLUDE_PROTO(ndpi_struct, flow);
return;
}
if (ntohs(hdr->version) != 0x3b0b)
{
NDPI_EXCLUDE_PROTO(ndpi_struct, flow);
return;
}
uint16_t command = ntohs(hdr->command);
if (command == 0x0000 || (command > 0x00b5 && command < 0x03f7) ||
command > 0x03f7)
{
NDPI_EXCLUDE_PROTO(ndpi_struct, flow);
return;
}
ndpi_int_oicq_add_connection(ndpi_struct, flow);
}
/* ***************************************************** */
void init_oicq_dissector(struct ndpi_detection_module_struct *ndpi_struct,
u_int32_t *id)
{
ndpi_set_bitmask_protocol_detection("OICQ", ndpi_struct, *id,
NDPI_PROTOCOL_OICQ,
ndpi_search_oicq,
NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_UDP_WITH_PAYLOAD,
SAVE_DETECTION_BITMASK_AS_UNKNOWN,
ADD_TO_DETECTION_BITMASK
);
*id += 1;
}