Support RX protocol (used by AFS).
This commit is contained in:
@@ -271,8 +271,9 @@
|
||||
#define NDPI_SERVICE_CLOUDFLARE 220
|
||||
#define NDPI_SERVICE_MS_ONE_DRIVE 221
|
||||
#define NDPI_PROTOCOL_MQTT 222
|
||||
#define NDPI_PROTOCOL_RX 223 /* RX: RPC protocol used by AFS */
|
||||
/* UPDATE UPDATE UPDATE UPDATE UPDATE UPDATE UPDATE UPDATE UPDATE */
|
||||
#define NDPI_LAST_IMPLEMENTED_PROTOCOL NDPI_PROTOCOL_MQTT
|
||||
#define NDPI_LAST_IMPLEMENTED_PROTOCOL NDPI_PROTOCOL_RX
|
||||
|
||||
#define NDPI_MAX_SUPPORTED_PROTOCOLS (NDPI_LAST_IMPLEMENTED_PROTOCOL + 1)
|
||||
#define NDPI_MAX_NUM_CUSTOM_PROTOCOLS (NDPI_NUM_BITS-NDPI_LAST_IMPLEMENTED_PROTOCOL)
|
||||
|
||||
@@ -198,6 +198,7 @@ void ndpi_search_starcraft(struct ndpi_detection_module_struct *ndpi_struct, str
|
||||
void ndpi_search_ubntac2(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
void ndpi_search_coap(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
void ndpi_search_mqtt (struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
void ndpi_search_rx(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
/* --- INIT FUNCTIONS --- */
|
||||
void init_afp_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||
void init_aimini_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||
@@ -337,4 +338,5 @@ void init_stracraft_dissector(struct ndpi_detection_module_struct *ndpi_struct,
|
||||
void init_ubntac2_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||
void init_coap_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||
void init_mqtt_dissector (struct ndpi_detection_module_struct *ndpi_struct,u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||
void init_rx_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||
#endif /* __NDPI_PROTOCOLS_H__ */
|
||||
|
||||
@@ -622,6 +622,10 @@ struct ndpi_flow_udp_struct {
|
||||
u_int8_t eaq_pkt_id;
|
||||
u_int32_t eaq_sequence;
|
||||
#endif
|
||||
#ifdef NDPI_PROTOCOL_RX
|
||||
u_int32_t rx_conn_epoch;
|
||||
u_int32_t rx_conn_id;
|
||||
#endif
|
||||
}
|
||||
#ifndef WIN32
|
||||
__attribute__ ((__packed__))
|
||||
|
||||
@@ -154,6 +154,7 @@ libndpi_la_SOURCES = ndpi_content_match.c.inc \
|
||||
protocols/zeromq.c \
|
||||
protocols/coap.c \
|
||||
protocols/mqtt.c \
|
||||
protocols/rx.c \
|
||||
third_party/include/actypes.h \
|
||||
third_party/include/ahocorasick.h \
|
||||
third_party/include/node.h \
|
||||
|
||||
@@ -1528,6 +1528,14 @@ static void ndpi_init_protocol_defaults(struct ndpi_detection_module_struct *ndp
|
||||
no_master, "MQTT",
|
||||
ndpi_build_default_ports(ports_a, 1883, 8883, 0, 0, 0), /* TCP */
|
||||
ndpi_build_default_ports(ports_b, 0, 0, 0, 0, 0)); /* UDP */
|
||||
ndpi_build_default_ports(ports_b, 0, 0, 0, 0, 0);
|
||||
ports_b[0].port_low = 7000;
|
||||
ports_b[0].port_high = 7032; /* See https://www-01.ibm.com/support/docview.wss?uid=swg21044407 */
|
||||
ndpi_set_proto_defaults(ndpi_mod,NDPI_PROTOCOL_ACCEPTABLE,NDPI_PROTOCOL_RX,
|
||||
no_master,
|
||||
no_master, "RX",
|
||||
ndpi_build_default_ports(ports_a, 0, 0, 0, 0, 0), /* TCP */
|
||||
ports_b); /* UDP */
|
||||
|
||||
/* calling function for host and content matched protocols */
|
||||
init_string_based_protocols(ndpi_mod);
|
||||
@@ -2495,6 +2503,9 @@ void ndpi_set_protocol_detection_bitmask2(struct ndpi_detection_module_struct *n
|
||||
/* MQTT */
|
||||
init_mqtt_dissector(ndpi_struct, &a, detection_bitmask);
|
||||
|
||||
/* RX */
|
||||
init_rx_dissector(ndpi_struct, &a, detection_bitmask);
|
||||
|
||||
/* Put false-positive sensitive protocols at the end */
|
||||
|
||||
/* SKYPE */
|
||||
|
||||
@@ -0,0 +1,105 @@
|
||||
#include "ndpi_api.h"
|
||||
|
||||
#ifdef NDPI_PROTOCOL_RX
|
||||
|
||||
/* See http://web.mit.edu/kolya/afs/rx/rx-spec for procotol description. */
|
||||
|
||||
/* The should be no need for explicit packing, but just in case... */
|
||||
struct __attribute__((__packed__)) ndpi_rx_header {
|
||||
u_int32_t conn_epoch;
|
||||
u_int32_t conn_id;
|
||||
u_int32_t call_number;
|
||||
u_int32_t sequence_number;
|
||||
u_int32_t serial_number;
|
||||
u_int8_t type;
|
||||
u_int8_t flags;
|
||||
u_int8_t status;
|
||||
u_int8_t security;
|
||||
u_int16_t checksum;
|
||||
u_int16_t service_id;
|
||||
};
|
||||
|
||||
void ndpi_check_rx(struct ndpi_detection_module_struct *ndpi_struct,
|
||||
struct ndpi_flow_struct *flow)
|
||||
{
|
||||
struct ndpi_packet_struct *packet = &flow->packet;
|
||||
u_int32_t payload_len = packet->payload_packet_len;
|
||||
int exclude = 0;
|
||||
int found = 0;
|
||||
|
||||
NDPI_LOG(NDPI_PROTOCOL_RX, ndpi_struct, NDPI_LOG_DEBUG, "RX: pck: %d, dir[0]: %d, dir[1]: %d\n",
|
||||
flow->packet_counter, flow->packet_direction_counter[0], flow->packet_direction_counter[1]);
|
||||
|
||||
/* Check that packet is long enough. */
|
||||
if (payload_len < sizeof(struct ndpi_rx_header)) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_RX, ndpi_struct, NDPI_LOG_DEBUG, "short packet\n");
|
||||
exclude = 1;
|
||||
goto end;
|
||||
}
|
||||
|
||||
/* Check whether the packet has counters beginning from one; the
|
||||
Sequence Number can be zero if the packet is just an ACK. */
|
||||
struct ndpi_rx_header *header = (struct ndpi_rx_header*) packet->payload;
|
||||
if ((ntohl(header->sequence_number) | 1) != 1 || ntohl(header->serial_number) != 1) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_RX, ndpi_struct, NDPI_LOG_DEBUG, "wrong counters\n");
|
||||
exclude = 1;
|
||||
goto end;
|
||||
}
|
||||
|
||||
/* If we have already seen one packet in the other direction, then
|
||||
the two must have matching connection numbers. Otherwise store
|
||||
them. */
|
||||
if (flow->packet_direction_counter[!packet->packet_direction] != 0) {
|
||||
if (flow->l4.udp.rx_conn_epoch == header->conn_epoch &&
|
||||
flow->l4.udp.rx_conn_id == header->conn_id) {
|
||||
found = 1;
|
||||
/* In theory we could inspect the service_id field of the header
|
||||
to know exactly which service is being used; see
|
||||
https://www.central.org/frameless/numbers/rxservice.html. */
|
||||
} else {
|
||||
NDPI_LOG(NDPI_PROTOCOL_RX, ndpi_struct, NDPI_LOG_DEBUG, "IDs not matching\n");
|
||||
exclude = 1;
|
||||
}
|
||||
goto end;
|
||||
} else {
|
||||
flow->l4.udp.rx_conn_epoch = header->conn_epoch;
|
||||
flow->l4.udp.rx_conn_id = header->conn_id;
|
||||
}
|
||||
|
||||
end:
|
||||
if (found) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_RX, ndpi_struct, NDPI_LOG_DEBUG, "found RX\n");
|
||||
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_RX, NDPI_PROTOCOL_UNKNOWN);
|
||||
}
|
||||
else if (exclude) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_RX, ndpi_struct, NDPI_LOG_DEBUG, "excluding RX\n");
|
||||
NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_RX);
|
||||
}
|
||||
}
|
||||
|
||||
void ndpi_search_rx(struct ndpi_detection_module_struct *ndpi_struct,
|
||||
struct ndpi_flow_struct *flow)
|
||||
{
|
||||
struct ndpi_packet_struct *packet = &flow->packet;
|
||||
|
||||
NDPI_LOG(NDPI_PROTOCOL_RX, ndpi_struct, NDPI_LOG_DEBUG, "entering RX search\n");
|
||||
if (packet->detected_protocol_stack[0] != NDPI_PROTOCOL_RX) {
|
||||
ndpi_check_rx(ndpi_struct, flow);
|
||||
}
|
||||
}
|
||||
|
||||
void init_rx_dissector(struct ndpi_detection_module_struct *ndpi_struct,
|
||||
u_int32_t *id,
|
||||
NDPI_PROTOCOL_BITMASK *detection_bitmask)
|
||||
{
|
||||
ndpi_set_bitmask_protocol_detection("RX", ndpi_struct, detection_bitmask, *id,
|
||||
NDPI_PROTOCOL_RX,
|
||||
ndpi_search_rx,
|
||||
NDPI_SELECTION_BITMASK_PROTOCOL_UDP_WITH_PAYLOAD,
|
||||
SAVE_DETECTION_BITMASK_AS_UNKNOWN,
|
||||
ADD_TO_DETECTION_BITMASK);
|
||||
|
||||
*id += 1;
|
||||
}
|
||||
|
||||
#endif
|
||||
Reference in New Issue
Block a user