diff options
| -rw-r--r-- | epan/dissectors/packet-sll.c | 1 | ||||
| -rw-r--r-- | epan/dissectors/packet-sll.h | 1 | ||||
| -rw-r--r-- | plugins/irda/packet-irda.c | 4 |
3 files changed, 5 insertions, 1 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 *); diff --git a/plugins/irda/packet-irda.c b/plugins/irda/packet-irda.c index 55bc5fe459..3a17547dbf 100644 --- 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"); } |