From: Guy Harris Date: Mon, 1 Jul 2013 17:58:55 +0000 (-0700) Subject: Add a LINKTYPE_ value for DLT_WIRESHARK_UPPER_PDU. X-Git-Tag: libpcap-1.5.0~47 X-Git-Url: https://git.tcpdump.org/libpcap/commitdiff_plain/fe6776af1e61d650bee653e90df9a2dad8241094 Add a LINKTYPE_ value for DLT_WIRESHARK_UPPER_PDU. They have the same numerical value, as with all newly-added link-layer header types. --- diff --git a/pcap-common.c b/pcap-common.c index fdd3c0cc..404e3a86 100644 --- a/pcap-common.c +++ b/pcap-common.c @@ -919,7 +919,20 @@ */ #define LINKTYPE_BLUETOOTH_LE_LL 251 -#define LINKTYPE_MATCHING_MAX 251 /* highest value in the "matching" range */ +/* + * Link-layer header type for upper-protocol layer PDU saves from wireshark. + * + * the actual contents are determined by two TAGs stored with each + * packet: + * EXP_PDU_TAG_LINKTYPE the link type (DLT value) of the + * original packet. + * + * EXP_PDU_TAG_PROTO_NAME the name of the wireshark dissector + * that can make sense of the data stored. + */ +#define LINKTYPE_WIRESHARK_UPPER_PDU 252 + +#define LINKTYPE_MATCHING_MAX 252 /* highest value in the "matching" range */ static struct linktype_map { int dlt; diff --git a/pcap/bpf.h b/pcap/bpf.h index 2608d5f2..51d4116d 100644 --- a/pcap/bpf.h +++ b/pcap/bpf.h @@ -1224,7 +1224,6 @@ struct bpf_program { */ #define DLT_WIRESHARK_UPPER_PDU 252 - #define DLT_MATCHING_MAX 252 /* highest value in the "matching" range */ /*