diff options
| author | James Ko <jck@exegin.com> | 2019-01-31 18:07:43 -0800 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2019-02-28 17:55:14 +0000 |
| commit | 6ce75092235934c457ba8d61f8a341c0dc31e562 (patch) | |
| tree | 6c9cbae9ac83a6a26ffb3c07eee8aed0038d5e81 /wiretap | |
| parent | a0c93f426b0bb3510af3e4657d95bd64e46ed5f8 (diff) | |
Add IEEE 802.15.4 TAP link type
New link type for IEEE 802.15.4 with pseudo-header and optional
meta-data TLVs, PHY payload exactly as it appears in the spec (no
padding, no nothing), and FCS if specified by FCS Type TLV.
Specification at https://github.com/jkcko/ieee802.15.4-tap
Bug: 15429
Change-Id: I67bd154891ad5818be9a1630aa5cbb863b55509a
Reviewed-on: https://code.wireshark.org/review/32141
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'wiretap')
| -rw-r--r-- | wiretap/pcap-common.c | 2 | ||||
| -rw-r--r-- | wiretap/wtap.c | 3 | ||||
| -rw-r--r-- | wiretap/wtap.h | 1 |
3 files changed, 6 insertions, 0 deletions
diff --git a/wiretap/pcap-common.c b/wiretap/pcap-common.c index 812d2ef289..a758e5cef0 100644 --- a/wiretap/pcap-common.c +++ b/wiretap/pcap-common.c @@ -470,6 +470,8 @@ static const struct { /* VPP dispatch trace */ { 280, WTAP_ENCAP_VPP }, + /* IEEE 802.15.4 TAP */ + { 283, WTAP_ENCAP_IEEE802_15_4_TAP }, /* * To repeat: * diff --git a/wiretap/wtap.c b/wiretap/wtap.c index 0614656302..36866a23cd 100644 --- a/wiretap/wtap.c +++ b/wiretap/wtap.c @@ -968,6 +968,9 @@ static struct encap_type_info encap_table_base[] = { /* WTAP_ENCAP_VPP */ { "vpp", "Vector Packet Processing graph dispatch trace" }, + + /* WTAP_ENCAP_IEEE802_15_4_TAP */ + { "wpan-tap", "IEEE 802.15.4 Wireless with TAP pseudo-header" }, }; WS_DLL_LOCAL diff --git a/wiretap/wtap.h b/wiretap/wtap.h index 3833a82379..fbb7168f17 100644 --- a/wiretap/wtap.h +++ b/wiretap/wtap.h @@ -286,6 +286,7 @@ extern "C" { #define WTAP_ENCAP_SYSTEMD_JOURNAL 203 /* Event, not a packet */ #define WTAP_ENCAP_EBHSCR 204 #define WTAP_ENCAP_VPP 205 +#define WTAP_ENCAP_IEEE802_15_4_TAP 206 /* After adding new item here, please also add new item to encap_table_base array */ |