From njohnkev:

Add support for LAPD data link type.

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

diff --git a/epan/dissectors/packet-lapd.c b/epan/dissectors/packet-lapd.c
index b55dfd5517d5b3647e22e7994caa5d62622632ef..e35e43afad3777a97c3ba40112894dbb5c3c7053 100644 (file)
--- a/epan/dissectors/packet-lapd.c
+++ b/epan/dissectors/packet-lapd.c
@@ -695,6 +695,7 @@ proto_reg_handoff_lapd(void)
 
                lapd_handle = find_dissector("lapd");
                dissector_add_uint("wtap_encap", WTAP_ENCAP_LINUX_LAPD, lapd_handle);
+               dissector_add_uint("wtap_encap", WTAP_ENCAP_LAPD, lapd_handle);
 
                lapd_bitstream_handle = create_dissector_handle(dissect_lapd_bitstream, proto_lapd);
                data_handle = find_dissector("data");

diff --git a/wiretap/pcap-common.c b/wiretap/pcap-common.c
index 7867618df63805bf79848f97ca09c65890003501..4f58e70aa6f0ee8ba829730ed5495aae9a7e70cf 100644 (file)
--- a/wiretap/pcap-common.c
+++ b/wiretap/pcap-common.c
@@ -333,6 +333,9 @@ static const struct {
        { 199,          WTAP_ENCAP_IPMB },
        /* Bluetooth HCI UART transport (part H:4) frames, like hcidump */
        { 201,          WTAP_ENCAP_BLUETOOTH_H4_WITH_PHDR },
+       /* LAPD frame */
+       { 203,          WTAP_ENCAP_LAPD },
+       /* PPP with pseudoheader */
        { 204,          WTAP_ENCAP_PPP_WITH_PHDR },
        /* IPMB/I2C */
        { 209,          WTAP_ENCAP_I2C },

diff --git a/wiretap/wtap.c b/wiretap/wtap.c
index efd175eb1c024a854914b13a5955f62b0e87b163..49a76e9869d7b1a59a4d78af703a2105f4705276 100644 (file)
--- a/wiretap/wtap.c
+++ b/wiretap/wtap.c
@@ -485,7 +485,10 @@ static struct encap_type_info encap_table_base[] = {
        { "Raw IPv4", "rawip4" },
 
        /* WTAP_ENCAP_RAW_IP6 */
-       { "Raw IPv6", "rawip6" }
+       { "Raw IPv6", "rawip6" },
+
+       /* WTAP_ENCAP_LAPD */
+       { "Lapd header", "lapd" }
 };
 
 gint wtap_num_encap_types = sizeof(encap_table_base) / sizeof(struct encap_type_info);

diff --git a/wiretap/wtap.h b/wiretap/wtap.h
index 6d298f6dc16c42de48624165f3eb71747d3232f2..eb70e745a832a4565632eef7dcd1ee98d7bc48fe 100644 (file)
--- a/wiretap/wtap.h
+++ b/wiretap/wtap.h
@@ -220,6 +220,7 @@ extern "C" {
 #define WTAP_ENCAP_RAW_IPFIX                    128
 #define WTAP_ENCAP_RAW_IP4                      129
 #define WTAP_ENCAP_RAW_IP6                      130
+#define WTAP_ENCAP_LAPD                         131
 
 #define WTAP_NUM_ENCAP_TYPES                    wtap_get_num_encap_types()