Add NATPMP dissector. (#1738)

Signed-off-by: lns <matzeton@googlemail.com>
Signed-off-by: Toni Uhlig <matzeton@googlemail.com>

Signed-off-by: lns <matzeton@googlemail.com>
Signed-off-by: Toni Uhlig <matzeton@googlemail.com>
This commit is contained in:
Toni
2022-09-16 13:32:30 +02:00
committed by GitHub
parent 9ce4d40d14
commit de020b1747
55 changed files with 553 additions and 391 deletions
+1
View File
@@ -340,6 +340,7 @@ typedef enum {
NDPI_PROTOCOL_KISMET = 309,
NDPI_PROTOCOL_FASTCGI = 310,
NDPI_PROTOCOL_FTPS = 311,
NDPI_PROTOCOL_NATPMP = 312,
#ifdef CUSTOM_NDPI_PROTOCOLS
#include "../../../nDPI-custom/custom_ndpi_protocol_ids.h"
+1
View File
@@ -240,6 +240,7 @@ void init_discord_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_
void init_tivoconnect_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
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);
/* ndpi_main.c */
extern u_int32_t ndpi_ip_port_hash_funct(u_int32_t ip, u_int16_t port);
+10 -3
View File
@@ -1975,9 +1975,13 @@ static void ndpi_init_protocol_defaults(struct ndpi_detection_module_struct *ndp
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, 0 /* encrypted */, 0 /* nw proto */, NDPI_PROTOCOL_UNSAFE, NDPI_PROTOCOL_FTPS,
"FTPS", 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 */);
"FTPS", 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 */);
ndpi_set_proto_defaults(ndpi_str, 1 /* cleartext */, 0 /* nw proto */, NDPI_PROTOCOL_ACCEPTABLE, NDPI_PROTOCOL_NATPMP,
"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 */);
#ifdef CUSTOM_NDPI_PROTOCOLS
#include "../../../nDPI-custom/custom_ndpi_main.c"
@@ -4577,6 +4581,9 @@ static int ndpi_callback_init(struct ndpi_detection_module_struct *ndpi_str) {
/* FastCGI */
init_fastcgi_dissector(ndpi_str, &a, detection_bitmask);
/* NATPMP */
init_natpmp_dissector(ndpi_str, &a, detection_bitmask);
#ifdef CUSTOM_NDPI_PROTOCOLS
#include "../../../nDPI-custom/custom_ndpi_main_init.c"
#endif
+126
View File
@@ -0,0 +1,126 @@
/*
* natpmp.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_NATPMP
#include "ndpi_api.h"
#define NATPMP_PORT 5351
enum natpmp_type {
NATPMP_REQUEST_ADDRESS = 0x00,
NATPMP_REQUEST_UDP_MAPPING = 0x01,
NATPMP_REQUEST_TCP_MAPPING = 0x02,
NATPMP_RESPONSE_ADRESS = 0x80,
NATPMP_RESPONSE_UDP_MAPPING = 0x81,
NATPMP_RESPONSE_TCP_MAPPING = 0x82
};
static void ndpi_int_natpmp_add_connection(struct ndpi_detection_module_struct * const ndpi_struct,
struct ndpi_flow_struct * const flow)
{
NDPI_LOG_INFO(ndpi_struct, "found nat-pmp\n");
ndpi_set_detected_protocol(ndpi_struct, flow,
NDPI_PROTOCOL_NATPMP,
NDPI_PROTOCOL_UNKNOWN,
NDPI_CONFIDENCE_DPI);
}
void ndpi_search_natpmp(struct ndpi_detection_module_struct *ndpi_struct,
struct ndpi_flow_struct *flow)
{
struct ndpi_packet_struct const * const packet = &ndpi_struct->packet;
enum natpmp_type natpmp_type;
NDPI_LOG_DBG(ndpi_struct, "search nat-pmp\n");
if (packet->payload_packet_len < 2 || packet->payload[0] != 0x00 /* Protocol version: 0x00 */)
{
NDPI_EXCLUDE_PROTO(ndpi_struct, flow);
return;
}
natpmp_type = packet->payload[1];
switch (natpmp_type)
{
case NATPMP_REQUEST_ADDRESS:
if (packet->payload_packet_len != 2)
{
NDPI_EXCLUDE_PROTO(ndpi_struct, flow);
}
return;
case NATPMP_REQUEST_UDP_MAPPING:
case NATPMP_REQUEST_TCP_MAPPING:
if (packet->payload_packet_len != 12 || get_u_int16_t(packet->payload, 2) != 0x0000)
{
NDPI_EXCLUDE_PROTO(ndpi_struct, flow);
return;
}
break;
case NATPMP_RESPONSE_ADRESS:
case NATPMP_RESPONSE_UDP_MAPPING:
case NATPMP_RESPONSE_TCP_MAPPING:
if ((natpmp_type == NATPMP_RESPONSE_ADRESS && packet->payload_packet_len != 12) ||
(natpmp_type != NATPMP_RESPONSE_ADRESS && packet->payload_packet_len != 16))
{
NDPI_EXCLUDE_PROTO(ndpi_struct, flow);
return;
}
{
u_int16_t result_code = ntohs(get_u_int16_t(packet->payload, 2));
if (result_code > 5)
{
NDPI_EXCLUDE_PROTO(ndpi_struct, flow);
return;
}
}
break;
default:
NDPI_EXCLUDE_PROTO(ndpi_struct, flow);
return;
}
if (flow->packet_counter > 2 ||
ntohs(packet->udp->source) == NATPMP_PORT || ntohs(packet->udp->dest) == NATPMP_PORT)
{
ndpi_int_natpmp_add_connection(ndpi_struct, flow);
}
}
void init_natpmp_dissector(struct ndpi_detection_module_struct *ndpi_struct,
u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask)
{
ndpi_set_bitmask_protocol_detection("NAT-PMP", ndpi_struct, detection_bitmask, *id,
NDPI_PROTOCOL_NATPMP,
ndpi_search_natpmp,
NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_UDP_WITH_PAYLOAD,
SAVE_DETECTION_BITMASK_AS_UNKNOWN,
ADD_TO_DETECTION_BITMASK
);
*id += 1;
}