diff options
author | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 2006-04-16 10:38:47 +0000 |
---|---|---|
committer | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 2006-04-16 10:38:47 +0000 |
commit | 3b1d1248076f35ba2df9f27f6fe01b198b9d137e (patch) | |
tree | 199362a9723940f90ec529140fc76dac797e3c38 /wiretap | |
parent | 85ee3ca880296b0bd0f7dc31249835f6b80c057e (diff) |
Get rid of the unused WTAP_ENCAP value - holes in the number space cause
ugly printouts for "editcap -T".
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@17873 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'wiretap')
-rw-r--r-- | wiretap/wtap.c | 3 | ||||
-rw-r--r-- | wiretap/wtap.h | 50 |
2 files changed, 25 insertions, 28 deletions
diff --git a/wiretap/wtap.c b/wiretap/wtap.c index c410e13190..ef998f0f0f 100644 --- a/wiretap/wtap.c +++ b/wiretap/wtap.c @@ -286,9 +286,6 @@ static const struct encap_type_info { /* WTAP_ENCAP_NETTL_RAW_ICMPV6 */ { "Raw ICMPv6 with nettl headers", "raw-icmpv6-nettl" }, - /* UNUSED */ - { "", "" }, - /* WTAP_ENCAP_GPRS_LLC */ { "GPRS LLC", "gprs-llc" }, diff --git a/wiretap/wtap.h b/wiretap/wtap.h index 7562fba066..b44a0b37d0 100644 --- a/wiretap/wtap.h +++ b/wiretap/wtap.h @@ -156,33 +156,33 @@ #define WTAP_ENCAP_BACNET_MS_TP 63 #define WTAP_ENCAP_NETTL_RAW_ICMP 64 #define WTAP_ENCAP_NETTL_RAW_ICMPV6 65 -#define WTAP_ENCAP_GPRS_LLC 67 -#define WTAP_ENCAP_JUNIPER_ATM1 68 -#define WTAP_ENCAP_JUNIPER_ATM2 69 -#define WTAP_ENCAP_REDBACK 70 -#define WTAP_ENCAP_NETTL_RAW_IP 71 -#define WTAP_ENCAP_NETTL_ETHERNET 72 -#define WTAP_ENCAP_NETTL_TOKEN_RING 73 -#define WTAP_ENCAP_NETTL_FDDI 74 -#define WTAP_ENCAP_NETTL_UNKNOWN 75 -#define WTAP_ENCAP_MTP2_WITH_PHDR 76 -#define WTAP_ENCAP_JUNIPER_PPPOE 77 -#define WTAP_GCOM_TIE1 78 -#define WTAP_GCOM_SERIAL 79 -#define WTAP_ENCAP_NETTL_X25 80 -#define WTAP_ENCAP_K12 81 -#define WTAP_ENCAP_JUNIPER_MLPPP 82 -#define WTAP_ENCAP_JUNIPER_MLFR 83 -#define WTAP_ENCAP_JUNIPER_ETHER 84 -#define WTAP_ENCAP_JUNIPER_PPP 85 -#define WTAP_ENCAP_JUNIPER_FRELAY 86 -#define WTAP_ENCAP_JUNIPER_CHDLC 87 -#define WTAP_ENCAP_JUNIPER_GGSN 88 -#define WTAP_ENCAP_LINUX_LAPD 89 -#define WTAP_ENCAP_CATAPULT_DCT2000 90 +#define WTAP_ENCAP_GPRS_LLC 66 +#define WTAP_ENCAP_JUNIPER_ATM1 67 +#define WTAP_ENCAP_JUNIPER_ATM2 68 +#define WTAP_ENCAP_REDBACK 69 +#define WTAP_ENCAP_NETTL_RAW_IP 70 +#define WTAP_ENCAP_NETTL_ETHERNET 71 +#define WTAP_ENCAP_NETTL_TOKEN_RING 72 +#define WTAP_ENCAP_NETTL_FDDI 73 +#define WTAP_ENCAP_NETTL_UNKNOWN 74 +#define WTAP_ENCAP_MTP2_WITH_PHDR 75 +#define WTAP_ENCAP_JUNIPER_PPPOE 76 +#define WTAP_GCOM_TIE1 77 +#define WTAP_GCOM_SERIAL 78 +#define WTAP_ENCAP_NETTL_X25 79 +#define WTAP_ENCAP_K12 80 +#define WTAP_ENCAP_JUNIPER_MLPPP 81 +#define WTAP_ENCAP_JUNIPER_MLFR 82 +#define WTAP_ENCAP_JUNIPER_ETHER 83 +#define WTAP_ENCAP_JUNIPER_PPP 84 +#define WTAP_ENCAP_JUNIPER_FRELAY 85 +#define WTAP_ENCAP_JUNIPER_CHDLC 86 +#define WTAP_ENCAP_JUNIPER_GGSN 87 +#define WTAP_ENCAP_LINUX_LAPD 88 +#define WTAP_ENCAP_CATAPULT_DCT2000 89 /* last WTAP_ENCAP_ value + 1 */ -#define WTAP_NUM_ENCAP_TYPES 91 +#define WTAP_NUM_ENCAP_TYPES 90 /* File types that can be read by wiretap. We support writing some many of these file types, too, so we |