aboutsummaryrefslogtreecommitdiffstats
path: root/epan
diff options
context:
space:
mode:
authorjake <jake@f5534014-38df-0310-8fa8-9805f1628bb7>2010-11-25 19:59:19 +0000
committerjake <jake@f5534014-38df-0310-8fa8-9805f1628bb7>2010-11-25 19:59:19 +0000
commit6df2ef1c14859ab19830a1bcd4b75bbc7fab3ab8 (patch)
tree461cd12691ce0b1919639342a59fcde9dc86625f /epan
parentb2d47d8f37b44c8e21774b3bc42c3b53f6f41d40 (diff)
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
Diffstat (limited to 'epan')
-rw-r--r--epan/dissectors/packet-sll.c1
-rw-r--r--epan/dissectors/packet-sll.h1
2 files changed, 2 insertions, 0 deletions
diff --git a/epan/dissectors/packet-sll.c b/epan/dissectors/packet-sll.c
index 14b5fb1934..4664cfeb04 100644
--- 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 de67e86688..315b0414cb 100644
--- 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 *);