Skip to content

Commit

Permalink
dismiss NETDISSECT_REWORKED macro
Browse files Browse the repository at this point in the history 
The purpose of this macro was to enable the file-by-file switch to NDO,
after which only tcpdump.c had a use of it and the definitions guarded
by it. Update tcpdump.c not to require them any more and dismiss the
unused definitions.
  • Loading branch information
@infrastation
infrastation committed Mar 22, 2015
1 parent 40451f7 commit 38700c7
Show file tree
Hide file tree
Showing 153 changed files with 104 additions and 299 deletions.
1 change: 0 additions & 1 deletion addrtoname.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
* and address to string conversion routines
*/

#define NETDISSECT_REWORKED
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
Expand Down
1 change: 0 additions & 1 deletion af.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
* Original code by Hannes Gredler ([email protected])
*/

#define NETDISSECT_REWORKED
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
Expand Down
1 change: 0 additions & 1 deletion bpf_dump.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/

#define NETDISSECT_REWORKED
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
Expand Down
1 change: 0 additions & 1 deletion checksum.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
* Original code by Hannes Gredler ([email protected])
*/

#define NETDISSECT_REWORKED
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
Expand Down
1 change: 0 additions & 1 deletion cpack.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
* OF SUCH DAMAGE.
*/

#define NETDISSECT_REWORKED
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
Expand Down
1 change: 0 additions & 1 deletion gmpls.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
* Original code by Hannes Gredler ([email protected])
*/

#define NETDISSECT_REWORKED
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
Expand Down
1 change: 0 additions & 1 deletion gmt2local.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/

#define NETDISSECT_REWORKED
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
Expand Down
1 change: 0 additions & 1 deletion in_cksum.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@
* @(#)in_cksum.c 8.1 (Berkeley) 6/10/93
*/

#define NETDISSECT_REWORKED
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
Expand Down
45 changes: 0 additions & 45 deletions interface.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -150,48 +150,3 @@ extern void bpf_dump(const struct bpf_program *, int);
#endif

#include "netdissect.h"

/* forward compatibility */

#ifndef NETDISSECT_REWORKED
extern netdissect_options *gndo;

#define bflag gndo->ndo_bflag
#define eflag gndo->ndo_eflag
#define fflag gndo->ndo_fflag
#define jflag gndo->ndo_jflag
#define Kflag gndo->ndo_Kflag
#define nflag gndo->ndo_nflag
#define Nflag gndo->ndo_Nflag
#define Oflag gndo->ndo_Oflag
#define pflag gndo->ndo_pflag
#define qflag gndo->ndo_qflag
#define Rflag gndo->ndo_Rflag
#define sflag gndo->ndo_sflag
#define Sflag gndo->ndo_Sflag
#define tflag gndo->ndo_tflag
#define Uflag gndo->ndo_Uflag
#define uflag gndo->ndo_uflag
#define vflag gndo->ndo_vflag
#define xflag gndo->ndo_xflag
#define Xflag gndo->ndo_Xflag
#define Cflag gndo->ndo_Cflag
#define Gflag gndo->ndo_Gflag
#define Aflag gndo->ndo_Aflag
#define Bflag gndo->ndo_Bflag
#define Iflag gndo->ndo_Iflag
#define suppress_default_print gndo->ndo_suppress_default_print
#define packettype gndo->ndo_packettype
#define sigsecret gndo->ndo_sigsecret
#define Wflag gndo->ndo_Wflag
#define WflagChars gndo->ndo_WflagChars
#define Cflag_count gndo->ndo_Cflag_count
#define Gflag_count gndo->ndo_Gflag_count
#define Gflag_time gndo->ndo_Gflag_time
#define Hflag gndo->ndo_Hflag
#define snaplen gndo->ndo_snaplen
#define snapend gndo->ndo_snapend

extern void default_print(const u_char *, u_int);

#endif
1 change: 0 additions & 1 deletion ipproto.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
* Original code by Hannes Gredler ([email protected])
*/

#define NETDISSECT_REWORKED
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
Expand Down
1 change: 0 additions & 1 deletion l2vpn.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
* Original code by Hannes Gredler ([email protected])
*/

#define NETDISSECT_REWORKED
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
Expand Down
1 change: 0 additions & 1 deletion nlpid.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
* Original code by Hannes Gredler ([email protected])
*/

#define NETDISSECT_REWORKED
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
Expand Down
1 change: 0 additions & 1 deletion oui.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
* Original code by Hannes Gredler ([email protected])
*/

#define NETDISSECT_REWORKED
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
Expand Down
1 change: 0 additions & 1 deletion parsenfsfh.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@
* Western Research Laboratory
*/

#define NETDISSECT_REWORKED
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
Expand Down
1 change: 0 additions & 1 deletion print-802_11.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/

#define NETDISSECT_REWORKED
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
Expand Down
1 change: 0 additions & 1 deletion print-802_15_4.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/

#define NETDISSECT_REWORKED
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
Expand Down
1 change: 0 additions & 1 deletion print-ah.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/

#define NETDISSECT_REWORKED
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
Expand Down
1 change: 0 additions & 1 deletion print-ahcp.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
* POSSIBILITY OF SUCH DAMAGE.
*/

#define NETDISSECT_REWORKED
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
Expand Down
1 change: 0 additions & 1 deletion print-aodv.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
* POSSIBILITY OF SUCH DAMAGE.
*/

#define NETDISSECT_REWORKED
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
Expand Down
1 change: 0 additions & 1 deletion print-aoe.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
* POSSIBILITY OF SUCH DAMAGE.
*/

#define NETDISSECT_REWORKED
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
Expand Down
1 change: 0 additions & 1 deletion print-ap1394.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/

#define NETDISSECT_REWORKED
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
Expand Down
1 change: 0 additions & 1 deletion print-arcnet.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
* From: NetBSD: print-arcnet.c,v 1.2 2000/04/24 13:02:28 itojun Exp
*/

#define NETDISSECT_REWORKED
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
Expand Down
1 change: 0 additions & 1 deletion print-arp.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/

#define NETDISSECT_REWORKED
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
Expand Down
1 change: 0 additions & 1 deletion print-ascii.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@
* POSSIBILITY OF SUCH DAMAGE.
*/

#define NETDISSECT_REWORKED
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
Expand Down
1 change: 0 additions & 1 deletion print-atalk.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
* Format and print AppleTalk packets.
*/

#define NETDISSECT_REWORKED
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
Expand Down
1 change: 0 additions & 1 deletion print-atm.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/

#define NETDISSECT_REWORKED
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
Expand Down
1 change: 0 additions & 1 deletion print-babel.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
* SUCH DAMAGE.
*/

#define NETDISSECT_REWORKED
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
Expand Down
1 change: 0 additions & 1 deletion print-beep.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
*
*/

#define NETDISSECT_REWORKED
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
Expand Down
1 change: 0 additions & 1 deletion print-bfd.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
* Original code by Hannes Gredler ([email protected])
*/

#define NETDISSECT_REWORKED
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
Expand Down
1 change: 0 additions & 1 deletion print-bgp.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
* complete BGP support.
*/

#define NETDISSECT_REWORKED
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
Expand Down
1 change: 0 additions & 1 deletion print-bootp.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
* Format and print bootp packets.
*/

#define NETDISSECT_REWORKED
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
Expand Down
1 change: 0 additions & 1 deletion print-bt.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/

#define NETDISSECT_REWORKED
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
Expand Down
1 change: 0 additions & 1 deletion print-calm-fast.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
* Original code by Ola Martin Lykkja ([email protected])
*/

#define NETDISSECT_REWORKED
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
Expand Down
1 change: 0 additions & 1 deletion print-carp.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
*
*/

#define NETDISSECT_REWORKED
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
Expand Down
1 change: 0 additions & 1 deletion print-cdp.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
* http://www.cisco.com/univercd/cc/td/doc/product/lan/trsrb/frames.htm
*/

#define NETDISSECT_REWORKED
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
Expand Down
1 change: 0 additions & 1 deletion print-cfm.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
* Original code by Hannes Gredler ([email protected])
*/

#define NETDISSECT_REWORKED
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
Expand Down
1 change: 0 additions & 1 deletion print-chdlc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/

#define NETDISSECT_REWORKED
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
Expand Down
1 change: 0 additions & 1 deletion print-cip.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
*
*/

#define NETDISSECT_REWORKED
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
Expand Down
1 change: 0 additions & 1 deletion print-cnfp.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@
* http://www.cisco.com/c/en/us/td/docs/net_mgmt/netflow_collection_engine/3-6/user/guide/format.html#wp1005892
*/

#define NETDISSECT_REWORKED
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
Expand Down
1 change: 0 additions & 1 deletion print-dccp.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
* BSD-style license that accompanies tcpdump or the GNU GPL version 2
*/

#define NETDISSECT_REWORKED
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
Expand Down
1 change: 0 additions & 1 deletion print-decnet.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/

#define NETDISSECT_REWORKED
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
Expand Down
1 change: 0 additions & 1 deletion print-dhcp6.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@
* RFC6334: Dual-Stack Lite option,
*/

#define NETDISSECT_REWORKED
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
Expand Down
1 change: 0 additions & 1 deletion print-domain.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/

#define NETDISSECT_REWORKED
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
Expand Down
1 change: 0 additions & 1 deletion print-dtp.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
* Original code by Carles Kishimoto <[email protected]>
*/

#define NETDISSECT_REWORKED
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
Expand Down
Loading

0 comments on commit 38700c7

Please sign in to comment.