diff options
author | Tim Potter <tpot@samba.org> | 2002-08-21 21:25:23 +0000 |
---|---|---|
committer | Tim Potter <tpot@samba.org> | 2002-08-21 21:25:23 +0000 |
commit | 60e4ca9c4f376ab67f78cbfe6e3ae903d5b2b144 (patch) | |
tree | 13169067303d57fe6a56e775824a8f09d320c494 | |
parent | ec975908e21dff2b59247fb756dec695ae5c61ba (diff) | |
download | wireshark-60e4ca9c4f376ab67f78cbfe6e3ae903d5b2b144.tar.gz wireshark-60e4ca9c4f376ab67f78cbfe6e3ae903d5b2b144.tar.bz2 wireshark-60e4ca9c4f376ab67f78cbfe6e3ae903d5b2b144.zip |
Moved the generic true_false_string saying "Set", "Not set" into
epan/packet.c
It was cut and pasted into seven other dissectors!
svn path=/trunk/; revision=6052
-rw-r--r-- | epan/packet.c | 7 | ||||
-rw-r--r-- | epan/packet.h | 4 | ||||
-rw-r--r-- | packet-aodv.c | 7 | ||||
-rw-r--r-- | packet-aodv6.c | 7 | ||||
-rw-r--r-- | packet-dcerpc.c | 7 | ||||
-rw-r--r-- | packet-ntlmssp.c | 7 | ||||
-rw-r--r-- | packet-sap.c | 7 | ||||
-rw-r--r-- | packet-snmp.c | 7 | ||||
-rw-r--r-- | packet-tcp.c | 9 |
9 files changed, 16 insertions, 46 deletions
diff --git a/epan/packet.c b/epan/packet.c index 494a89cc48..d500f60a23 100644 --- a/epan/packet.c +++ b/epan/packet.c @@ -1,7 +1,7 @@ /* packet.c * Routines for packet disassembly * - * $Id: packet.c,v 1.75 2002/08/02 21:29:39 jmayer Exp $ + * $Id: packet.c,v 1.76 2002/08/21 21:25:21 tpot Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -63,6 +63,11 @@ static gint proto_malformed = -1; static dissector_handle_t frame_handle = NULL; static dissector_handle_t data_handle = NULL; +const true_false_string flags_set_truth = { + "Set", + "Not set" +}; + void packet_init(void) { diff --git a/epan/packet.h b/epan/packet.h index 99c8339e0f..e53efd263b 100644 --- a/epan/packet.h +++ b/epan/packet.h @@ -1,7 +1,7 @@ /* packet.h * Definitions for packet disassembly structures and routines * - * $Id: packet.h,v 1.58 2002/08/02 21:29:39 jmayer Exp $ + * $Id: packet.h,v 1.59 2002/08/21 21:25:21 tpot Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -77,6 +77,8 @@ typedef struct true_false_string { char *false_string; } true_false_string; +extern const true_false_string flags_set_truth; + extern void packet_init(void); extern void packet_cleanup(void); diff --git a/packet-aodv.c b/packet-aodv.c index 01123b4237..9b1ce4d6b6 100644 --- a/packet-aodv.c +++ b/packet-aodv.c @@ -2,7 +2,7 @@ * Routines for AODV dissection * Copyright 2000, Erik Nordström <erik.nordstrom@it.uu.se> * - * $Id: packet-aodv.c,v 1.3 2002/08/02 23:35:47 jmayer Exp $ + * $Id: packet-aodv.c,v 1.4 2002/08/21 21:25:23 tpot Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -51,11 +51,6 @@ #define RERR_NODEL 0x80 -static const true_false_string flags_set_truth = { - "Set", - "Not set" -}; - static const value_string type_vals[] = { { RREQ, "RREQ" }, { RREP, "RREP" }, diff --git a/packet-aodv6.c b/packet-aodv6.c index d11a85f6d3..6e8fc4bc6a 100644 --- a/packet-aodv6.c +++ b/packet-aodv6.c @@ -3,7 +3,7 @@ * Copyright 2002, Antti J. Tuominen <ajtuomin@tml.hut.fi> * Loosely based on packet-aodv.c. * - * $Id: packet-aodv6.c,v 1.2 2002/08/02 23:35:47 jmayer Exp $ + * $Id: packet-aodv6.c,v 1.3 2002/08/21 21:25:23 tpot Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -62,11 +62,6 @@ #define RERR_NODEL 0x80 -static const true_false_string flags_set_truth = { - "Set", - "Not set" -}; - static const value_string type_vals[] = { {AODV6_RREQ, "Route Request"}, {AODV6_RREP, "Route Reply"}, diff --git a/packet-dcerpc.c b/packet-dcerpc.c index 8ab9e3f88c..584b3cf71a 100644 --- a/packet-dcerpc.c +++ b/packet-dcerpc.c @@ -2,7 +2,7 @@ * Routines for DCERPC packet disassembly * Copyright 2001, Todd Sabin <tas@webspan.net> * - * $Id: packet-dcerpc.c,v 1.71 2002/08/13 07:25:36 tpot Exp $ + * $Id: packet-dcerpc.c,v 1.72 2002/08/21 21:25:23 tpot Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -81,11 +81,6 @@ static const value_string drep_fp_vals[] = { { 0, NULL } }; -static const true_false_string flags_set_truth = { - "Set", - "Not set" -}; - /* * Authentication services. */ diff --git a/packet-ntlmssp.c b/packet-ntlmssp.c index 1e1f6f1bf9..f966016898 100644 --- a/packet-ntlmssp.c +++ b/packet-ntlmssp.c @@ -2,7 +2,7 @@ * Routines for NTLM Secure Service Provider * Devin Heitmueller <dheitmueller@netilla.com> * - * $Id: packet-ntlmssp.c,v 1.7 2002/08/18 20:33:47 guy Exp $ + * $Id: packet-ntlmssp.c,v 1.8 2002/08/21 21:25:23 tpot Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -47,11 +47,6 @@ static const value_string ntlmssp_message_types[] = { { 0, NULL } }; -static const true_false_string flags_set_truth = { - "Set", - "Not set" -}; - /* * NTLMSSP negotiation flags * Taken from Samba diff --git a/packet-sap.c b/packet-sap.c index 85574f6def..25ca3989be 100644 --- a/packet-sap.c +++ b/packet-sap.c @@ -4,7 +4,7 @@ * * Heikki Vatiainen <hessu@cs.tut.fi> * - * $Id: packet-sap.c,v 1.28 2002/08/02 23:36:00 jmayer Exp $ + * $Id: packet-sap.c,v 1.29 2002/08/21 21:25:23 tpot Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -52,11 +52,6 @@ static const true_false_string mcast_sap_address_type = { "IPv4" }; -static const true_false_string flags_set_truth = { - "Set", - "Not set" -}; - static const true_false_string mcast_sap_message_type = { "Deletion", "Announcement" diff --git a/packet-snmp.c b/packet-snmp.c index e5bab4bab9..602646504d 100644 --- a/packet-snmp.c +++ b/packet-snmp.c @@ -8,7 +8,7 @@ * * See RFCs 1905, 1906, 1909, and 1910 for SNMPv2u. * - * $Id: packet-snmp.c,v 1.94 2002/08/02 23:36:03 jmayer Exp $ + * $Id: packet-snmp.c,v 1.95 2002/08/21 21:25:23 tpot Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -113,11 +113,6 @@ static dissector_handle_t data_handle; #define TH_CRYPT 0x02 #define TH_REPORT 0x04 -static const true_false_string flags_set_truth = { - "Set", - "Not set" -}; - #define UDP_PORT_SNMP 161 #define UDP_PORT_SNMP_TRAP 162 #define TCP_PORT_SMUX 199 diff --git a/packet-tcp.c b/packet-tcp.c index 1b38ea4d4b..20d539af02 100644 --- a/packet-tcp.c +++ b/packet-tcp.c @@ -1,7 +1,7 @@ /* packet-tcp.c * Routines for TCP packet disassembly * - * $Id: packet-tcp.c,v 1.152 2002/08/17 22:26:00 sahlberg Exp $ + * $Id: packet-tcp.c,v 1.153 2002/08/21 21:25:23 tpot Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -1538,13 +1538,6 @@ static const ip_tcp_opt tcpopts[] = { #define N_TCP_OPTS (sizeof tcpopts / sizeof tcpopts[0]) -/* TCP flags flag */ -static const true_false_string flags_set_truth = { - "Set", - "Not set" -}; - - /* Determine if there is a sub-dissector and call it. This has been */ /* separated into a stand alone routine to other protocol dissectors */ /* can call to it, ie. socks */ |