diff options
| author | Mikhail Gusarov <dottedmag@dottedmag.net> | 2020-08-24 20:36:35 +0200 |
|---|---|---|
| committer | Misha Gusarov <gitlab@dt.mg> | 2020-08-24 19:34:07 +0000 |
| commit | ab4ef189ae2009cf9147d967867acff76984d269 (patch) | |
| tree | 0b18e34ff594215f1e26dfc8fa66b3e12683061a /wiretap | |
| parent | 17e27e6c8b0a7d559d4fb0be81d5de440326495b (diff) | |
wiretap: add Z-Wave Serial API frame type and pcap link-layer header
This header type was added to pcap registry a year ago:
https://lists.sandelman.ca/pipermail/tcpdump-workers/2019-July/001268.html
Diffstat (limited to 'wiretap')
| -rw-r--r-- | wiretap/pcap-common.c | 3 | ||||
| -rw-r--r-- | wiretap/wtap.c | 3 | ||||
| -rw-r--r-- | wiretap/wtap.h | 1 |
3 files changed, 7 insertions, 0 deletions
diff --git a/wiretap/pcap-common.c b/wiretap/pcap-common.c index f8d60caf35..1cc7676f2e 100644 --- a/wiretap/pcap-common.c +++ b/wiretap/pcap-common.c @@ -476,6 +476,9 @@ static const struct { /* IEEE 802.15.4 TAP */ { 283, WTAP_ENCAP_IEEE802_15_4_TAP }, + /* Z-Wave Serial API */ + { 287, WTAP_ENCAP_ZWAVE_SERIAL }, + /* USB 2.0/1.1/1.0 packets as transmitted over the cable */ { 288, WTAP_ENCAP_USB_2_0 }, /* diff --git a/wiretap/wtap.c b/wiretap/wtap.c index 804b027ca5..2317b30285 100644 --- a/wiretap/wtap.c +++ b/wiretap/wtap.c @@ -1086,6 +1086,9 @@ static struct encap_type_info encap_table_base[] = { /* WTAP_ENCAP_SLL2 */ { "linux-sll2", "Linux cooked-mode capture v2" }, + + /* WTAP_ENCAP_ZWAVE_SERIAL */ + { "zwave-serial", "Z-Wave Serial API packets" }, }; WS_DLL_LOCAL diff --git a/wiretap/wtap.h b/wiretap/wtap.h index f27aa9f263..ecba086802 100644 --- a/wiretap/wtap.h +++ b/wiretap/wtap.h @@ -291,6 +291,7 @@ extern "C" { #define WTAP_ENCAP_USB_2_0 208 #define WTAP_ENCAP_MP4 209 #define WTAP_ENCAP_SLL2 210 +#define WTAP_ENCAP_ZWAVE_SERIAL 211 /* After adding new item here, please also add new item to encap_table_base array */ |