aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJakub Zawadzki <darkjames-ws@darkjames.pl>2016-03-24 21:47:04 +0100
committerAlexis La Goutte <alexis.lagoutte@gmail.com>2016-03-25 06:12:03 +0000
commit5eda8842670632f0b4f97acea32930f6ef93c6ae (patch)
tree92732dc47811a24a172b7d0d406d0064cf5a2973
parent98ccc699a7b5800c322179d053a43c0bf0cefbe1 (diff)
Add MQTT over SSL port.
Change-Id: If44d33e739bc02425aea437e34ea8531b4223691 Reviewed-on: https://code.wireshark.org/review/14617 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-rw-r--r--epan/dissectors/packet-mqtt.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/epan/dissectors/packet-mqtt.c b/epan/dissectors/packet-mqtt.c
index 6be27631ca..2796dae59e 100644
--- a/epan/dissectors/packet-mqtt.c
+++ b/epan/dissectors/packet-mqtt.c
@@ -28,8 +28,11 @@
#include <epan/packet.h>
#include <epan/dwarf.h>
#include "packet-tcp.h"
+#include "packet-ssl.h"
+
+#define MQTT_DEFAULT_PORT 1883 /* IANA registered under service name as mqtt */
+#define MQTT_SSL_DEFAULT_PORT 8883 /* IANA registered under service name secure-mqtt */
-#define MQTT_DEFAULT_PORT 1883
#define MQTT_HDR_SIZE_BEFORE_LEN 1
/* MQTT MEssage Types */
@@ -589,6 +592,7 @@ void proto_register_mqtt(void)
void proto_reg_handoff_mqtt(void)
{
dissector_add_uint("tcp.port", MQTT_DEFAULT_PORT, mqtt_handle);
+ ssl_dissector_add(MQTT_SSL_DEFAULT_PORT, mqtt_handle);
}
/*