From 7b0c4950a53beeb2d42d72cf683b1862a99f63ea Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Tue, 13 Jul 2021 23:48:19 -0700 Subject: wiretap: clean up option definitions a bit. Spell out "DESCRIPTION" for the IDB description option, as it's spelled out in the pcapng spec. Put the #defines for various options in the same order as the block types for them are in the pcapng spec. --- wiretap/wtap_opttypes.h | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) (limited to 'wiretap/wtap_opttypes.h') diff --git a/wiretap/wtap_opttypes.h b/wiretap/wtap_opttypes.h index 249f6482ab..87a71e27ba 100644 --- a/wiretap/wtap_opttypes.h +++ b/wiretap/wtap_opttypes.h @@ -47,7 +47,7 @@ extern "C" { * of the device used to capture data. * "eth0" / "\Device\NPF_{AD1CE675-96D0-47C5-ADD0-2504B9126B68}" */ -#define OPT_IDB_DESCR 3 /**< A UTF-8 string containing the description +#define OPT_IDB_DESCRIPTION 3 /**< A UTF-8 string containing the description * of the device used to capture data. * "Wi-Fi" / "Local Area Connection" / * "Wireless Network Connection" / @@ -114,6 +114,15 @@ extern "C" { * "NETGEAR WNA1000Mv2 N150 Wireless USB Micro Adapter" */ +/* + * These are the flags for an EPB, but we use them for all WTAP_BLOCK_PACKET + */ +#define OPT_PKT_FLAGS 2 +#define OPT_PKT_HASH 3 +#define OPT_PKT_DROPCOUNT 4 +#define OPT_PKT_PACKETID 5 +#define OPT_PKT_QUEUE 6 +#define OPT_PKT_VERDICT 7 /* Name Resolution Block (NRB) */ #define OPT_NS_DNSNAME 2 @@ -129,16 +138,6 @@ extern "C" { #define OPT_ISB_OSDROP 7 #define OPT_ISB_USRDELIV 8 -/* - * These are the flags for an EPB, but we use them for all WTAP_BLOCK_PACKET - */ -#define OPT_PKT_FLAGS 2 -#define OPT_PKT_HASH 3 -#define OPT_PKT_DROPCOUNT 4 -#define OPT_PKT_PACKETID 5 -#define OPT_PKT_QUEUE 6 -#define OPT_PKT_VERDICT 7 - struct wtap_block; typedef struct wtap_block *wtap_block_t; -- cgit v1.2.3