Add Syncthing dissector.

Signed-off-by: Toni Uhlig <matzeton@googlemail.com>
This commit is contained in:
Toni Uhlig
2022-09-16 15:21:49 +02:00
committed by Toni
parent de020b1747
commit ec1981c20c
55 changed files with 161 additions and 49 deletions
+1
View File
@@ -341,6 +341,7 @@ typedef enum {
NDPI_PROTOCOL_FASTCGI = 310,
NDPI_PROTOCOL_FTPS = 311,
NDPI_PROTOCOL_NATPMP = 312,
NDPI_PROTOCOL_SYNCTHING = 313,
#ifdef CUSTOM_NDPI_PROTOCOLS
#include "../../../nDPI-custom/custom_ndpi_protocol_ids.h"
+1
View File
@@ -241,6 +241,7 @@ void init_tivoconnect_dissector(struct ndpi_detection_module_struct *ndpi_struct
void init_kismet_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
void init_fastcgi_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
void init_natpmp_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
void init_syncthing_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
/* ndpi_main.c */
extern u_int32_t ndpi_ip_port_hash_funct(u_int32_t ip, u_int16_t port);
+2
View File
@@ -1704,6 +1704,8 @@ static ndpi_protocol_match host_match[] =
{ "cachefly.com", "CacheFly", NDPI_PROTOCOL_CACHEFLY, NDPI_PROTOCOL_CATEGORY_CLOUD, NDPI_PROTOCOL_ACCEPTABLE, NDPI_PROTOCOL_DEFAULT_LEVEL },
{ "discovery.syncthing.net", "Syncthing", NDPI_PROTOCOL_SYNCTHING, NDPI_PROTOCOL_CATEGORY_DOWNLOAD_FT, NDPI_PROTOCOL_ACCEPTABLE, NDPI_PROTOCOL_DEFAULT_LEVEL },
#ifdef CUSTOM_NDPI_PROTOCOLS
#include "../../../nDPI-custom/custom_ndpi_content_match_host_match.c.inc"
#endif
+7
View File
@@ -1982,6 +1982,10 @@ static void ndpi_init_protocol_defaults(struct ndpi_detection_module_struct *ndp
"NAT-PMP", NDPI_PROTOCOL_CATEGORY_NETWORK,
ndpi_build_default_ports(ports_a, 0, 0, 0, 0, 0) /* TCP */,
ndpi_build_default_ports(ports_b, 5351, 0, 0, 0, 0) /* UDP */);
ndpi_set_proto_defaults(ndpi_str, 0 /* encrypted */, 0 /* nw proto */, NDPI_PROTOCOL_ACCEPTABLE, NDPI_PROTOCOL_SYNCTHING,
"Syncthing", NDPI_PROTOCOL_CATEGORY_DOWNLOAD_FT,
ndpi_build_default_ports(ports_a, 0, 0, 0, 0, 0) /* TCP */,
ndpi_build_default_ports(ports_b, 0, 0, 0, 0, 0) /* UDP */);
#ifdef CUSTOM_NDPI_PROTOCOLS
#include "../../../nDPI-custom/custom_ndpi_main.c"
@@ -4584,6 +4588,9 @@ static int ndpi_callback_init(struct ndpi_detection_module_struct *ndpi_str) {
/* NATPMP */
init_natpmp_dissector(ndpi_str, &a, detection_bitmask);
/* Syncthing */
init_syncthing_dissector(ndpi_str, &a, detection_bitmask);
#ifdef CUSTOM_NDPI_PROTOCOLS
#include "../../../nDPI-custom/custom_ndpi_main_init.c"
#endif
+74
View File
@@ -0,0 +1,74 @@
/*
* syncthing.c
*
* Copyright (C) 2022 - 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_SYNCTHING
#include "ndpi_api.h"
static void ndpi_int_syncthing_add_connection(struct ndpi_detection_module_struct * const ndpi_struct,
struct ndpi_flow_struct * const flow)
{
NDPI_LOG_INFO(ndpi_struct, "found syncthing\n");
ndpi_set_detected_protocol(ndpi_struct, flow,
NDPI_PROTOCOL_SYNCTHING,
NDPI_PROTOCOL_UNKNOWN,
NDPI_CONFIDENCE_DPI);
}
void ndpi_search_syncthing(struct ndpi_detection_module_struct *ndpi_struct,
struct ndpi_flow_struct *flow)
{
struct ndpi_packet_struct const * const packet = &ndpi_struct->packet;
NDPI_LOG_DBG(ndpi_struct, "search syncthing\n");
if (packet->payload_packet_len <= 4)
{
NDPI_EXCLUDE_PROTO(ndpi_struct, flow);
return;
}
if (ntohl(get_u_int32_t(packet->payload, 0)) == 0x2EA7D90B /* Magic */)
{
ndpi_int_syncthing_add_connection(ndpi_struct, flow);
/* ToDo: Dissect Announce Message. Protocol buffer dissector required. */
return;
}
NDPI_EXCLUDE_PROTO(ndpi_struct, flow);
return;
}
void init_syncthing_dissector(struct ndpi_detection_module_struct *ndpi_struct,
u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask)
{
ndpi_set_bitmask_protocol_detection("Syncthing", ndpi_struct, detection_bitmask, *id,
NDPI_PROTOCOL_SYNCTHING,
ndpi_search_syncthing,
NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_UDP_WITH_PAYLOAD,
SAVE_DETECTION_BITMASK_AS_UNKNOWN,
ADD_TO_DETECTION_BITMASK
);
*id += 1;
}