Fix for bug 5435:

Add support for dissecting SLL type 0x17 frames.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35029 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/epan/dissectors/packet-sll.c b/epan/dissectors/packet-sll.c
index 14b5fb1934a68d7280f6989bd6c985fe1fb003be..4664cfeb04f98441a8b26b114ff2f19b700cc974 100644 (file)
--- a/epan/dissectors/packet-sll.c
+++ b/epan/dissectors/packet-sll.c
@@ -83,6 +83,7 @@ static const value_string ltype_vals[] = {
        { LINUX_SLL_P_802_2,    "802.2 LLC" },
        { LINUX_SLL_P_PPPHDLC,  "PPP (HDLC)" },
        { LINUX_SLL_P_CAN,      "CAN" },
+       { LINUX_SLL_P_IRDA_LAP, "IrDA LAP" },
        { 0,                    NULL }
 };
 

diff --git a/epan/dissectors/packet-sll.h b/epan/dissectors/packet-sll.h
index de67e86688e245cb9a2afd883b18bebeb12e6d64..315b0414cb82ef5fa820ad91b84e50976c0bdee1 100644 (file)
--- a/epan/dissectors/packet-sll.h
+++ b/epan/dissectors/packet-sll.h
@@ -32,6 +32,7 @@
 #define LINUX_SLL_P_802_2      0x0004  /* 802.2 frames (not D/I/X Ethernet) */
 #define LINUX_SLL_P_PPPHDLC    0x0007  /* PPP HDLC frames */
 #define LINUX_SLL_P_CAN                0x000C  /* Controller Area Network */
+#define LINUX_SLL_P_IRDA_LAP   0x0017  /* IrDA Link Access Protocol */
 
 void capture_sll(const guchar *, int, packet_counts *);
 

diff --git a/plugins/irda/packet-irda.c b/plugins/irda/packet-irda.c
index 55bc5fe4595216d4376b9cce0d7231f48d9d22a6..3a17547dbf78254724cc4143b30bcbfdfbcee0b2 100644 (file)
--- a/plugins/irda/packet-irda.c
+++ b/plugins/irda/packet-irda.c
@@ -40,6 +40,7 @@
 #include <epan/xdlc.h>
 
 #include "irda-appl.h"
+#include <epan/dissectors/packet-sll.h>
 
 /*
  * This plugin dissects infrared data transmissions as defined by the IrDA
@@ -2239,8 +2240,9 @@ void proto_register_irda(void)
 void proto_reg_handoff_irda(void)
 {
     dissector_handle_t irda_handle;
-
+    
     irda_handle = find_dissector("irda");
     dissector_add("wtap_encap", WTAP_ENCAP_IRDA, irda_handle);
+    dissector_add("sll.ltype", LINUX_SLL_P_IRDA_LAP, irda_handle);
     data_handle = find_dissector("data");
 }