diff options
| author | Jakub Zawadzki <darkjames-ws@darkjames.pl> | 2012-03-31 17:29:41 +0000 |
|---|---|---|
| committer | Jakub Zawadzki <darkjames-ws@darkjames.pl> | 2012-03-31 17:29:41 +0000 |
| commit | bb8afe3f688c137bc275354b4ffc36f766e154e5 (patch) | |
| tree | 7b393c2a4aab53724c6cc4a618f9f53da1b08922 /wiretap | |
| parent | 56ef1c48177f440def325f8bbefcd7f90cb9d96c (diff) | |
| download | wireshark-bb8afe3f688c137bc275354b4ffc36f766e154e5.tar.gz | |
Add initial support for dissecting packets encapsulated in Netfilter LOG (DLT_NFLOG=239).
svn path=/trunk/; revision=41872
Diffstat (limited to 'wiretap')
| -rw-r--r-- | wiretap/pcap-common.c | 2 | ||||
| -rw-r--r-- | wiretap/wtap.h | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/wiretap/pcap-common.c b/wiretap/pcap-common.c index c5780cd47f..0cc27620e4 100644 --- a/wiretap/pcap-common.c +++ b/wiretap/pcap-common.c @@ -377,6 +377,8 @@ static const struct { { 235, WTAP_ENCAP_DVBCI }, /* MUX27010 */ { 236, WTAP_ENCAP_MUX27010 }, + /* NFLOG */ + { 239, WTAP_ENCAP_NFLOG }, /* netANALYZER pseudo-header followed by Ethernet with CRC */ { 240, WTAP_ENCAP_NETANALYZER }, /* netANALYZER pseudo-header in transparent mode */ diff --git a/wiretap/wtap.h b/wiretap/wtap.h index 11fadde350..3a009a8197 100644 --- a/wiretap/wtap.h +++ b/wiretap/wtap.h @@ -228,8 +228,9 @@ extern "C" { #define WTAP_ENCAP_NETANALYZER_TRANSPARENT 136 #define WTAP_ENCAP_IP_OVER_IB 137 #define WTAP_ENCAP_MPEG_2_TS 138 -#define WTAP_ENCAP_PPP_ETHER 139 +#define WTAP_ENCAP_PPP_ETHER 139 #define WTAP_ENCAP_NFC_LLCP 140 +#define WTAP_ENCAP_NFLOG 141 #define WTAP_NUM_ENCAP_TYPES wtap_get_num_encap_types() |