Add WTAP_ENCAP_NETLINK which maps to DLT_NETLINK /253/

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

diff --git a/wiretap/pcap-common.c b/wiretap/pcap-common.c
index c4bca6e79eaa67382c2c3ed54beffe9082155437..01fadec39b516dd3b784a0d2079befcbf61fb744 100644 (file)
--- a/wiretap/pcap-common.c
+++ b/wiretap/pcap-common.c
@@ -417,6 +417,8 @@ static const struct {
        { 251,          WTAP_ENCAP_BLUETOOTH_LE_LL},
        /* Wireshark Upper PDU export */
        { 252,          WTAP_ENCAP_WIRESHARK_UPPER_PDU},
+       /* Netlink Protocol (nlmon devices) */
+       { 253,          WTAP_ENCAP_NETLINK },
 
        /*
         * To repeat:

diff --git a/wiretap/wtap.c b/wiretap/wtap.c
index 241a23b2ef48f9ae0dc593595a85a8e05b90ce30..2b849176f83c032244aa6bd5282b0770ec21e0e3 100644 (file)
--- a/wiretap/wtap.c
+++ b/wiretap/wtap.c
@@ -692,6 +692,9 @@ static struct encap_type_info encap_table_base[] = {
 
        /* WTAP_ENCAP_STANAG_5066_D_PDU */      
        { "STANAG 5066 Data Transfer Sublayer PDUs(D_PDU)", "s5066-dpdu"}, 
+
+       /* WTAP_ENCAP_NETLINK */
+       { "Netlink", "Linux netlink" },
 };
 
 WS_DLL_LOCAL

diff --git a/wiretap/wtap.h b/wiretap/wtap.h
index b35163c46806c97f53ff787052ba04d425d450a5..9b4ec88e0b3c5922ec7ac913fe0ff1f9444ba3f3 100644 (file)
--- a/wiretap/wtap.h
+++ b/wiretap/wtap.h
@@ -251,6 +251,7 @@ extern "C" {
 #define WTAP_ENCAP_WIRESHARK_UPPER_PDU          156
 #define WTAP_ENCAP_STANAG_4607                  157
 #define WTAP_ENCAP_STANAG_5066_D_PDU            158
+#define WTAP_ENCAP_NETLINK                      159
 /* After adding new item here, please also add new item to encap_table_base array */
 
 #define WTAP_NUM_ENCAP_TYPES                    wtap_get_num_encap_types()