aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-nflog.c
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2014-03-14 12:23:03 -0700
committerGuy Harris <guy@alum.mit.edu>2014-03-14 19:23:57 +0000
commit6e339201f019e130efbdfddfe29b26647eaac99d (patch)
treea47f09495acef6c1643eb5b94f06ee7563943b1a /epan/dissectors/packet-nflog.c
parentbf0b7f796874de7df9a4397bae20bc4bd8a3cae1 (diff)
Get rid of a no-longer used preference.
We no longer need a preference to determine the byte order of the T and L in the TLVs, as libpcap and libwiretap both, when reading a file, translate from the file's byte order to the reading host's byte order and, in fact, currently don't use the variable in which the preference is stored; eliminate the preference. Change-Id: Id06a6284960c1ac77028af07f3937eb4a7b0acaa Reviewed-on: https://code.wireshark.org/review/656 Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'epan/dissectors/packet-nflog.c')
-rw-r--r--epan/dissectors/packet-nflog.c17
1 files changed, 0 insertions, 17 deletions
diff --git a/epan/dissectors/packet-nflog.c b/epan/dissectors/packet-nflog.c
index 9a552f37da..de6711591e 100644
--- a/epan/dissectors/packet-nflog.c
+++ b/epan/dissectors/packet-nflog.c
@@ -56,19 +56,6 @@ enum ws_nfulnl_attr_type {
WS_NFULA_HWLEN /* hardware header length */
};
-#define BYTE_ORDER_AUTO 0
-#define BYTE_ORDER_BE 1
-#define BYTE_ORDER_LE 2
-#define BYTE_ORDER_HOST 3
-
-static const enum_val_t byte_order_types[] = {
- { "Auto", "Auto", BYTE_ORDER_AUTO },
- { "Host", "Host", BYTE_ORDER_HOST },
- { "LE", "Little Endian", BYTE_ORDER_LE },
- { "BE", "Big Endian", BYTE_ORDER_BE },
- { NULL, NULL, 0 }
-};
-
static const value_string nflog_tlv_vals[] = {
{ WS_NFULA_UNSPEC, "NFULA_UNSPEC" },
{ WS_NFULA_PACKET_HDR, "NFULA_PACKET_HDR" },
@@ -91,8 +78,6 @@ static const value_string nflog_tlv_vals[] = {
{ 0, NULL }
};
-static gint nflog_byte_order = BYTE_ORDER_AUTO;
-
static int ett_nflog = -1;
static int ett_nflog_tlv = -1;
@@ -305,8 +290,6 @@ proto_register_nflog(void)
hfi_nflog = proto_registrar_get_nth(proto_nflog);
pref = prefs_register_protocol(proto_nflog, NULL);
- prefs_register_enum_preference(pref, "byte_order_type", "Byte Order", "Byte Order",
- &nflog_byte_order, byte_order_types, FALSE);
register_dissector("nflog", dissect_nflog, proto_nflog);