First draft of the Mqtt dissector.
This commit is contained in:
@@ -269,9 +269,10 @@
|
||||
#define NDPI_SERVICE_OCS 218
|
||||
#define NDPI_SERVICE_OFFICE_365 219
|
||||
#define NDPI_PROTOCOL_COAP 221
|
||||
#define NDPI_PROTOCOL_MQTT 222
|
||||
|
||||
/* UPDATE UPDATE UPDATE UPDATE UPDATE UPDATE UPDATE UPDATE UPDATE */
|
||||
#define NDPI_LAST_IMPLEMENTED_PROTOCOL NDPI_PROTOCOL_COAP
|
||||
#define NDPI_LAST_IMPLEMENTED_PROTOCOL NDPI_PROTOCOL_MQTT
|
||||
|
||||
#define NDPI_MAX_SUPPORTED_PROTOCOLS (NDPI_LAST_IMPLEMENTED_PROTOCOL + 1)
|
||||
#define NDPI_MAX_NUM_CUSTOM_PROTOCOLS (NDPI_NUM_BITS-NDPI_LAST_IMPLEMENTED_PROTOCOL)
|
||||
|
||||
@@ -584,6 +584,9 @@ struct ndpi_flow_tcp_struct {
|
||||
u_int8_t prev_zmq_pkt_len;
|
||||
u_char prev_zmq_pkt[10];
|
||||
#endif
|
||||
#ifdef NDPI_PROTOCOL_MQTT
|
||||
u_int8_t mqtt_stage:2;
|
||||
#endif
|
||||
}
|
||||
#ifndef WIN32
|
||||
__attribute__ ((__packed__))
|
||||
|
||||
@@ -156,6 +156,7 @@ libndpi_la_SOURCES = ndpi_content_match.c.inc \
|
||||
protocols/zattoo.c \
|
||||
protocols/zeromq.c \
|
||||
protocols/coap.c \
|
||||
protocols/mqtt.c \
|
||||
third_party/include/actypes.h \
|
||||
third_party/include/ahocorasick.h \
|
||||
third_party/include/node.h \
|
||||
|
||||
+9
-1
@@ -1502,7 +1502,12 @@ static void ndpi_init_protocol_defaults(struct ndpi_detection_module_struct *ndp
|
||||
no_master,
|
||||
no_master, "COAP",
|
||||
ndpi_build_default_ports(ports_a, 0, 0, 0, 0, 0), /* TCP */
|
||||
ndpi_build_default_ports(ports_b, 5683, 0, 0, 0, 0)); /* UDP */
|
||||
ndpi_build_default_ports(ports_b, 5683, 5684, 0, 0, 0)); /* UDP */
|
||||
ndpi_set_proto_defaults(ndpi_mod,NDPI_PROTOCOL_ACCEPTABLE,NDPI_PROTOCOL_MQTT,
|
||||
no_master,
|
||||
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 */
|
||||
|
||||
/* calling function for host and content matched protocols */
|
||||
init_string_based_protocols(ndpi_mod);
|
||||
@@ -2470,6 +2475,9 @@ void ndpi_set_protocol_detection_bitmask2(struct ndpi_detection_module_struct *n
|
||||
/* COAP */
|
||||
init_coap_dissector(ndpi_struct, &a, detection_bitmask);
|
||||
|
||||
/* MQTT */
|
||||
init_mqtt_dissector(ndpi_struct, &a, detection_bitmask);
|
||||
|
||||
/* Put false-positive sensitive protocols at the end */
|
||||
|
||||
/* SKYPE */
|
||||
|
||||
@@ -0,0 +1,79 @@
|
||||
/*
|
||||
* mqtt.c
|
||||
*
|
||||
* Copyright (C) 2016 Sorin Zamfir <sorin.zamfir@yahoo.com>
|
||||
*
|
||||
* This file is part of nDPI, an open source deep packet inspection
|
||||
* library based on the OpenDPI and PACE technology by ipoque GmbH
|
||||
*
|
||||
* 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_protocols.h"
|
||||
#ifdef NDPI_PROTOCOL_MQTT
|
||||
/**
|
||||
* Entry point when protocol is identified.
|
||||
*/
|
||||
static void ndpi_int_mqtt_add_connection (struct ndpi_detection_module_struct *ndpi_struct,
|
||||
struct ndpi_flow_struct *flow)
|
||||
{
|
||||
ndpi_set_detected_protocol(ndpi_struct,flow,NDPI_PROTOCOL_MQTT,NDPI_PROTOCOL_UNKNOWN);
|
||||
NDPI_LOG(NDPI_PROTOCOL_MQTT, ndpi_struct, NDPI_LOG_DEBUG, "Mqtt found.\n");
|
||||
}
|
||||
|
||||
/**
|
||||
* Dissector function that searches Mqtt headers
|
||||
*/
|
||||
void ndpi_search_mqtt (struct ndpi_detection_module_struct *ndpi_struct,
|
||||
struct ndpi_flow_struct *flow)
|
||||
{
|
||||
NDPI_LOG(NDPI_PROTOCOL_MQTT, ndpi_struct, NDPI_LOG_DEBUG, "Mqtt search called...\n");
|
||||
struct ndpi_packet_struct *packet = &flow->packet;
|
||||
if (packet->detected_protocol_stack[0] != NDPI_PROTOCOL_UNKNOWN) {
|
||||
return;
|
||||
}
|
||||
NDPI_LOG(NDPI_PROTOCOL_MQTT, ndpi_struct, NDPI_LOG_DEBUG, "Mqtt detection...\n");
|
||||
// searching for request
|
||||
NDPI_LOG(NDPI_PROTOCOL_MQTT, ndpi_struct, NDPI_LOG_DEBUG, "====>>>> Mqtt header: %04x%04x%04x%04x [len: %u]\n",
|
||||
packet->payload[0], packet->payload[1], packet->payload[2], packet->payload[3], packet->payload_packet_len);
|
||||
if (packet->payload_packet_len < 2) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_MQTT, ndpi_struct, NDPI_LOG_DEBUG, "Excluding Mqtt .. mandatory header not found!\n");
|
||||
NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_MQTT);
|
||||
return;
|
||||
}
|
||||
u_int8_t pt = (u_int8_t) (packet->payload[0]);
|
||||
|
||||
NDPI_LOG(NDPI_PROTOCOL_MQTT, ndpi_struct, NDPI_LOG_DEBUG, "Excluding Mqtt ...\n");
|
||||
NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_MQTT);
|
||||
return;
|
||||
//TODO
|
||||
}
|
||||
/**
|
||||
* Entry point for the ndpi library
|
||||
*/
|
||||
void init_mqtt_dissector (struct ndpi_detection_module_struct *ndpi_struct,
|
||||
u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask)
|
||||
{
|
||||
NDPI_LOG(NDPI_PROTOCOL_MQTT, ndpi_struct, NDPI_LOG_DEBUG, "Mqtt dissector init...\n");
|
||||
ndpi_set_bitmask_protocol_detection ("MQTT", ndpi_struct, detection_bitmask, *id,
|
||||
NDPI_PROTOCOL_MQTT,
|
||||
ndpi_search_mqtt,
|
||||
NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD,
|
||||
SAVE_DETECTION_BITMASK_AS_UNKNOWN, ADD_TO_DETECTION_BITMASK);
|
||||
*id +=1;
|
||||
}
|
||||
|
||||
#endif // NDPI_PROTOCOL_MQTT
|
||||
|
||||
Reference in New Issue
Block a user