diff options
| -rw-r--r-- | addrtoname.c | 1 | ||||
| -rw-r--r-- | af.c | 1 | ||||
| -rw-r--r-- | bpf_dump.c | 1 | ||||
| -rw-r--r-- | checksum.c | 1 | ||||
| -rw-r--r-- | cpack.c | 1 | ||||
| -rw-r--r-- | gmpls.c | 1 | ||||
| -rw-r--r-- | gmt2local.c | 1 | ||||
| -rw-r--r-- | in_cksum.c | 1 | ||||
| -rw-r--r-- | interface.h | 45 | ||||
| -rw-r--r-- | ipproto.c | 1 | ||||
| -rw-r--r-- | l2vpn.c | 1 | ||||
| -rw-r--r-- | nlpid.c | 1 | ||||
| -rw-r--r-- | oui.c | 1 | ||||
| -rw-r--r-- | parsenfsfh.c | 1 | ||||
| -rw-r--r-- | print-802_11.c | 1 | ||||
| -rw-r--r-- | print-802_15_4.c | 1 | ||||
| -rw-r--r-- | print-ah.c | 1 | ||||
| -rw-r--r-- | print-ahcp.c | 1 | ||||
| -rw-r--r-- | print-aodv.c | 1 | ||||
| -rw-r--r-- | print-aoe.c | 1 | ||||
| -rw-r--r-- | print-ap1394.c | 1 | ||||
| -rw-r--r-- | print-arcnet.c | 1 | ||||
| -rw-r--r-- | print-arp.c | 1 | ||||
| -rw-r--r-- | print-ascii.c | 1 | ||||
| -rw-r--r-- | print-atalk.c | 1 | ||||
| -rw-r--r-- | print-atm.c | 1 | ||||
| -rw-r--r-- | print-babel.c | 1 | ||||
| -rw-r--r-- | print-beep.c | 1 | ||||
| -rw-r--r-- | print-bfd.c | 1 | ||||
| -rw-r--r-- | print-bgp.c | 1 | ||||
| -rw-r--r-- | print-bootp.c | 1 | ||||
| -rw-r--r-- | print-bt.c | 1 | ||||
| -rw-r--r-- | print-calm-fast.c | 1 | ||||
| -rw-r--r-- | print-carp.c | 1 | ||||
| -rw-r--r-- | print-cdp.c | 1 | ||||
| -rw-r--r-- | print-cfm.c | 1 | ||||
| -rw-r--r-- | print-chdlc.c | 1 | ||||
| -rw-r--r-- | print-cip.c | 1 | ||||
| -rw-r--r-- | print-cnfp.c | 1 | ||||
| -rw-r--r-- | print-dccp.c | 1 | ||||
| -rw-r--r-- | print-decnet.c | 1 | ||||
| -rw-r--r-- | print-dhcp6.c | 1 | ||||
| -rw-r--r-- | print-domain.c | 1 | ||||
| -rw-r--r-- | print-dtp.c | 1 | ||||
| -rw-r--r-- | print-dvmrp.c | 1 | ||||
| -rw-r--r-- | print-eap.c | 1 | ||||
| -rw-r--r-- | print-egp.c | 1 | ||||
| -rw-r--r-- | print-eigrp.c | 1 | ||||
| -rw-r--r-- | print-enc.c | 1 | ||||
| -rw-r--r-- | print-esp.c | 1 | ||||
| -rw-r--r-- | print-ether.c | 1 | ||||
| -rw-r--r-- | print-fddi.c | 1 | ||||
| -rw-r--r-- | print-forces.c | 1 | ||||
| -rw-r--r-- | print-fr.c | 1 | ||||
| -rw-r--r-- | print-frag6.c | 1 | ||||
| -rw-r--r-- | print-geneve.c | 1 | ||||
| -rw-r--r-- | print-geonet.c | 1 | ||||
| -rw-r--r-- | print-gre.c | 1 | ||||
| -rw-r--r-- | print-hsrp.c | 1 | ||||
| -rw-r--r-- | print-icmp.c | 1 | ||||
| -rw-r--r-- | print-icmp6.c | 1 | ||||
| -rw-r--r-- | print-igmp.c | 1 | ||||
| -rw-r--r-- | print-igrp.c | 1 | ||||
| -rw-r--r-- | print-ip.c | 1 | ||||
| -rw-r--r-- | print-ip6.c | 1 | ||||
| -rw-r--r-- | print-ip6opts.c | 1 | ||||
| -rw-r--r-- | print-ipcomp.c | 1 | ||||
| -rw-r--r-- | print-ipfc.c | 1 | ||||
| -rw-r--r-- | print-ipnet.c | 1 | ||||
| -rw-r--r-- | print-ipx.c | 1 | ||||
| -rw-r--r-- | print-isakmp.c | 1 | ||||
| -rw-r--r-- | print-isoclns.c | 1 | ||||
| -rw-r--r-- | print-juniper.c | 1 | ||||
| -rw-r--r-- | print-krb.c | 1 | ||||
| -rw-r--r-- | print-l2tp.c | 1 | ||||
| -rw-r--r-- | print-lane.c | 1 | ||||
| -rw-r--r-- | print-ldp.c | 1 | ||||
| -rw-r--r-- | print-llc.c | 1 | ||||
| -rw-r--r-- | print-lldp.c | 1 | ||||
| -rw-r--r-- | print-lmp.c | 1 | ||||
| -rw-r--r-- | print-loopback.c | 1 | ||||
| -rw-r--r-- | print-lspping.c | 1 | ||||
| -rw-r--r-- | print-lwapp.c | 1 | ||||
| -rw-r--r-- | print-lwres.c | 1 | ||||
| -rw-r--r-- | print-m3ua.c | 1 | ||||
| -rw-r--r-- | print-mobile.c | 1 | ||||
| -rw-r--r-- | print-mobility.c | 1 | ||||
| -rw-r--r-- | print-mpcp.c | 1 | ||||
| -rw-r--r-- | print-mpls.c | 1 | ||||
| -rw-r--r-- | print-mptcp.c | 1 | ||||
| -rw-r--r-- | print-msdp.c | 1 | ||||
| -rw-r--r-- | print-msnlb.c | 1 | ||||
| -rw-r--r-- | print-nflog.c | 1 | ||||
| -rw-r--r-- | print-nfs.c | 1 | ||||
| -rw-r--r-- | print-ntp.c | 1 | ||||
| -rw-r--r-- | print-null.c | 1 | ||||
| -rw-r--r-- | print-olsr.c | 1 | ||||
| -rw-r--r-- | print-openflow-1.0.c | 1 | ||||
| -rw-r--r-- | print-openflow.c | 1 | ||||
| -rw-r--r-- | print-ospf.c | 1 | ||||
| -rw-r--r-- | print-ospf6.c | 1 | ||||
| -rw-r--r-- | print-otv.c | 1 | ||||
| -rw-r--r-- | print-pflog.c | 1 | ||||
| -rw-r--r-- | print-pgm.c | 1 | ||||
| -rw-r--r-- | print-pim.c | 1 | ||||
| -rw-r--r-- | print-pktap.c | 1 | ||||
| -rw-r--r-- | print-ppi.c | 2 | ||||
| -rw-r--r-- | print-ppp.c | 1 | ||||
| -rw-r--r-- | print-pppoe.c | 1 | ||||
| -rw-r--r-- | print-pptp.c | 1 | ||||
| -rw-r--r-- | print-radius.c | 1 | ||||
| -rw-r--r-- | print-raw.c | 1 | ||||
| -rw-r--r-- | print-rip.c | 1 | ||||
| -rw-r--r-- | print-ripng.c | 1 | ||||
| -rw-r--r-- | print-rpki-rtr.c | 1 | ||||
| -rw-r--r-- | print-rrcp.c | 1 | ||||
| -rw-r--r-- | print-rsvp.c | 1 | ||||
| -rw-r--r-- | print-rt6.c | 1 | ||||
| -rw-r--r-- | print-rx.c | 1 | ||||
| -rw-r--r-- | print-sctp.c | 1 | ||||
| -rw-r--r-- | print-sflow.c | 1 | ||||
| -rw-r--r-- | print-sip.c | 1 | ||||
| -rw-r--r-- | print-sl.c | 1 | ||||
| -rw-r--r-- | print-sll.c | 1 | ||||
| -rw-r--r-- | print-slow.c | 1 | ||||
| -rw-r--r-- | print-smb.c | 1 | ||||
| -rw-r--r-- | print-snmp.c | 1 | ||||
| -rw-r--r-- | print-stp.c | 1 | ||||
| -rw-r--r-- | print-sunatm.c | 1 | ||||
| -rw-r--r-- | print-sunrpc.c | 1 | ||||
| -rw-r--r-- | print-symantec.c | 1 | ||||
| -rw-r--r-- | print-syslog.c | 1 | ||||
| -rw-r--r-- | print-tcp.c | 1 | ||||
| -rw-r--r-- | print-telnet.c | 1 | ||||
| -rw-r--r-- | print-tftp.c | 1 | ||||
| -rw-r--r-- | print-timed.c | 1 | ||||
| -rw-r--r-- | print-tipc.c | 1 | ||||
| -rw-r--r-- | print-token.c | 1 | ||||
| -rw-r--r-- | print-udld.c | 1 | ||||
| -rw-r--r-- | print-udp.c | 1 | ||||
| -rw-r--r-- | print-usb.c | 1 | ||||
| -rw-r--r-- | print-vjc.c | 1 | ||||
| -rw-r--r-- | print-vqp.c | 1 | ||||
| -rw-r--r-- | print-vrrp.c | 1 | ||||
| -rw-r--r-- | print-vtp.c | 1 | ||||
| -rw-r--r-- | print-vxlan.c | 1 | ||||
| -rw-r--r-- | print-wb.c | 1 | ||||
| -rw-r--r-- | print-zephyr.c | 1 | ||||
| -rw-r--r-- | print-zeromq.c | 1 | ||||
| -rw-r--r-- | signature.c | 1 | ||||
| -rw-r--r-- | smbutil.c | 1 | ||||
| -rw-r--r-- | tcpdump.c | 206 | ||||
| -rw-r--r-- | util.c | 1 |
153 files changed, 104 insertions, 299 deletions
diff --git a/addrtoname.c b/addrtoname.c index 6d957389..e1319583 100644 --- a/addrtoname.c +++ b/addrtoname.c @@ -22,7 +22,6 @@ * and address to string conversion routines */ -#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif @@ -15,7 +15,6 @@ * Original code by Hannes Gredler (hannes@juniper.net) */ -#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif @@ -19,7 +19,6 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ -#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif @@ -17,7 +17,6 @@ * Original code by Hannes Gredler (hannes@juniper.net) */ -#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif @@ -27,7 +27,6 @@ * OF SUCH DAMAGE. */ -#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif @@ -13,7 +13,6 @@ * Original code by Hannes Gredler (hannes@juniper.net) */ -#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/gmt2local.c b/gmt2local.c index 6958f66a..2ab9c102 100644 --- a/gmt2local.c +++ b/gmt2local.c @@ -19,7 +19,6 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ -#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif @@ -35,7 +35,6 @@ * @(#)in_cksum.c 8.1 (Berkeley) 6/10/93 */ -#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H # include "config.h" #endif diff --git a/interface.h b/interface.h index 2389c2e1..f033fc71 100644 --- a/interface.h +++ b/interface.h @@ -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 @@ -13,7 +13,6 @@ * Original code by Hannes Gredler (hannes@juniper.net) */ -#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif @@ -13,7 +13,6 @@ * Original code by Hannes Gredler (hannes@juniper.net) */ -#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif @@ -13,7 +13,6 @@ * Original code by Hannes Gredler (hannes@juniper.net) */ -#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif @@ -13,7 +13,6 @@ * Original code by Hannes Gredler (hannes@juniper.net) */ -#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/parsenfsfh.c b/parsenfsfh.c index 826ca94e..4d14f3d6 100644 --- a/parsenfsfh.c +++ b/parsenfsfh.c @@ -40,7 +40,6 @@ * Western Research Laboratory */ -#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/print-802_11.c b/print-802_11.c index 697e2c92..5438c7be 100644 --- a/print-802_11.c +++ b/print-802_11.c @@ -20,7 +20,6 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ -#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/print-802_15_4.c b/print-802_15_4.c index 26c28ee6..b41e15ac 100644 --- a/print-802_15_4.c +++ b/print-802_15_4.c @@ -20,7 +20,6 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ -#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif @@ -21,7 +21,6 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ -#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/print-ahcp.c b/print-ahcp.c index a9ae38a9..7c69e7b3 100644 --- a/print-ahcp.c +++ b/print-ahcp.c @@ -29,7 +29,6 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/print-aodv.c b/print-aodv.c index ef27eee6..a29fef50 100644 --- a/print-aodv.c +++ b/print-aodv.c @@ -30,7 +30,6 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/print-aoe.c b/print-aoe.c index f8bc1fc9..a1dfc66b 100644 --- a/print-aoe.c +++ b/print-aoe.c @@ -29,7 +29,6 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/print-ap1394.c b/print-ap1394.c index 3befe233..4f70faef 100644 --- a/print-ap1394.c +++ b/print-ap1394.c @@ -19,7 +19,6 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ -#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/print-arcnet.c b/print-arcnet.c index 0ffb9220..cd6f5d9a 100644 --- a/print-arcnet.c +++ b/print-arcnet.c @@ -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 diff --git a/print-arp.c b/print-arp.c index 76f39fe0..b54a30f0 100644 --- a/print-arp.c +++ b/print-arp.c @@ -19,7 +19,6 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ -#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/print-ascii.c b/print-ascii.c index 3cefef33..71f16ff4 100644 --- a/print-ascii.c +++ b/print-ascii.c @@ -36,7 +36,6 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/print-atalk.c b/print-atalk.c index 61405493..0a235c82 100644 --- a/print-atalk.c +++ b/print-atalk.c @@ -21,7 +21,6 @@ * Format and print AppleTalk packets. */ -#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/print-atm.c b/print-atm.c index 8faf715d..64c2ff29 100644 --- a/print-atm.c +++ b/print-atm.c @@ -19,7 +19,6 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ -#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/print-babel.c b/print-babel.c index 75cb32cf..bb2612c6 100644 --- a/print-babel.c +++ b/print-babel.c @@ -26,7 +26,6 @@ * SUCH DAMAGE. */ -#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/print-beep.c b/print-beep.c index 7982feb5..4c5bc84a 100644 --- a/print-beep.c +++ b/print-beep.c @@ -9,7 +9,6 @@ * */ -#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/print-bfd.c b/print-bfd.c index f1c2ee8c..0450175f 100644 --- a/print-bfd.c +++ b/print-bfd.c @@ -13,7 +13,6 @@ * Original code by Hannes Gredler (hannes@juniper.net) */ -#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/print-bgp.c b/print-bgp.c index c617c3bb..6a4fa2c0 100644 --- a/print-bgp.c +++ b/print-bgp.c @@ -30,7 +30,6 @@ * complete BGP support. */ -#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/print-bootp.c b/print-bootp.c index fe0a070c..07c518e8 100644 --- a/print-bootp.c +++ b/print-bootp.c @@ -21,7 +21,6 @@ * Format and print bootp packets. */ -#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif @@ -17,7 +17,6 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ -#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/print-calm-fast.c b/print-calm-fast.c index 5cc39f41..5d1cb64f 100644 --- a/print-calm-fast.c +++ b/print-calm-fast.c @@ -15,7 +15,6 @@ * Original code by Ola Martin Lykkja (ola.lykkja@q-free.com) */ -#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/print-carp.c b/print-carp.c index 7b9f28ce..6417c1a8 100644 --- a/print-carp.c +++ b/print-carp.c @@ -34,7 +34,6 @@ * */ -#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/print-cdp.c b/print-cdp.c index 932f7bcc..c28bd882 100644 --- a/print-cdp.c +++ b/print-cdp.c @@ -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 diff --git a/print-cfm.c b/print-cfm.c index a85eec09..735fb1ee 100644 --- a/print-cfm.c +++ b/print-cfm.c @@ -17,7 +17,6 @@ * Original code by Hannes Gredler (hannes@juniper.net) */ -#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/print-chdlc.c b/print-chdlc.c index 3951ef77..766ae381 100644 --- a/print-chdlc.c +++ b/print-chdlc.c @@ -19,7 +19,6 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ -#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/print-cip.c b/print-cip.c index 91abe08d..fadb83be 100644 --- a/print-cip.c +++ b/print-cip.c @@ -20,7 +20,6 @@ * */ -#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/print-cnfp.c b/print-cnfp.c index d80d7fd2..ea8b318d 100644 --- a/print-cnfp.c +++ b/print-cnfp.c @@ -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 diff --git a/print-dccp.c b/print-dccp.c index 45468b55..979f6d34 100644 --- a/print-dccp.c +++ b/print-dccp.c @@ -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 diff --git a/print-decnet.c b/print-decnet.c index 5414ec20..f32b511e 100644 --- a/print-decnet.c +++ b/print-decnet.c @@ -19,7 +19,6 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ -#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/print-dhcp6.c b/print-dhcp6.c index 53b96ef9..ff55917a 100644 --- a/print-dhcp6.c +++ b/print-dhcp6.c @@ -40,7 +40,6 @@ * RFC6334: Dual-Stack Lite option, */ -#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/print-domain.c b/print-domain.c index 8805007a..3fcd9016 100644 --- a/print-domain.c +++ b/print-domain.c @@ -19,7 +19,6 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ -#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/print-dtp.c b/print-dtp.c index 5d84a770..5983b843 100644 --- a/print-dtp.c +++ b/print-dtp.c @@ -17,7 +17,6 @@ * Original code by Carles Kishimoto <carles.kishimoto@gmail.com> */ -#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/print-dvmrp.c b/print-dvmrp.c index 96a0ee73..8e008326 100644 --- a/print-dvmrp.c +++ b/print-dvmrp.c @@ -19,7 +19,6 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ -#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/print-eap.c b/print-eap.c index 0e2c2d38..58b1159e 100644 --- a/print-eap.c +++ b/print-eap.c @@ -21,7 +21,6 @@ * */ -#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/print-egp.c b/print-egp.c index 9c5c811e..8e4abc65 100644 --- a/print-egp.c +++ b/print-egp.c @@ -18,7 +18,6 @@ * Initial contribution from Jeff Honig (jch@MITCHELL.CIT.CORNELL.EDU). */ -#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/print-eigrp.c b/print-eigrp.c index cab77ba5..5718d511 100644 --- a/print-eigrp.c +++ b/print-eigrp.c @@ -14,7 +14,6 @@ * FOR A PARTICULAR PURPOSE. */ -#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/print-enc.c b/print-enc.c index 7bd8631e..84dc01ba 100644 --- a/print-enc.c +++ b/print-enc.c @@ -21,7 +21,6 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ -#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/print-esp.c b/print-esp.c index 8e267d45..d4101cef 100644 --- a/print-esp.c +++ b/print-esp.c @@ -21,7 +21,6 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ -#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/print-ether.c b/print-ether.c index e57d993b..e491515c 100644 --- a/print-ether.c +++ b/print-ether.c @@ -19,7 +19,6 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ -#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/print-fddi.c b/print-fddi.c index ad760c85..04ab0f67 100644 --- a/print-fddi.c +++ b/print-fddi.c @@ -19,7 +19,6 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ -#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/print-forces.c b/print-forces.c index 6c02b256..6626e31f 100644 --- a/print-forces.c +++ b/print-forces.c @@ -14,7 +14,6 @@ * */ -#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif @@ -19,7 +19,6 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ -#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/print-frag6.c b/print-frag6.c index 12909528..53dafb4c 100644 --- a/print-frag6.c +++ b/print-frag6.c @@ -19,7 +19,6 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ -#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/print-geneve.c b/print-geneve.c index 2187ab8e..56b9f2b5 100644 --- a/print-geneve.c +++ b/print-geneve.c @@ -15,7 +15,6 @@ * FOR A PARTICULAR PURPOSE. */ -#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/print-geonet.c b/print-geonet.c index edfb7f2d..6daf8b1d 100644 --- a/print-geonet.c +++ b/print-geonet.c @@ -15,7 +15,6 @@ * Original code by Ola Martin Lykkja (ola.lykkja@q-free.com) */ -#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/print-gre.c b/print-gre.c index 4d7705f8..ec209556 100644 --- a/print-gre.c +++ b/print-gre.c @@ -36,7 +36,6 @@ * RFC1701 (GRE), RFC1702 (GRE IPv4), and RFC2637 (Enhanced GRE) */ -#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/print-hsrp.c b/print-hsrp.c index 0e2420f7..35272b94 100644 --- a/print-hsrp.c +++ b/print-hsrp.c @@ -29,7 +29,6 @@ /* Cisco Hot Standby Router Protocol (HSRP). */ -#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/print-icmp.c b/print-icmp.c index 59eb0077..e7039876 100644 --- a/print-icmp.c +++ b/print-icmp.c @@ -19,7 +19,6 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ -#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/print-icmp6.c b/print-icmp6.c index 81563e6c..f6907a4c 100644 --- a/print-icmp6.c +++ b/print-icmp6.c @@ -19,7 +19,6 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ -#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/print-igmp.c b/print-igmp.c index e4808a77..d3a685aa 100644 --- a/print-igmp.c +++ b/print-igmp.c @@ -19,7 +19,6 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ -#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/print-igrp.c b/print-igrp.c index fbb31342..7f4f1302 100644 --- a/print-igrp.c +++ b/print-igrp.c @@ -21,7 +21,6 @@ * Initial contribution from Francis Dupont (francis.dupont@inria.fr) */ -#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif @@ -19,7 +19,6 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ -#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/print-ip6.c b/print-ip6.c index dd6b7f51..fa461926 100644 --- a/print-ip6.c +++ b/print-ip6.c @@ -19,7 +19,6 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ -#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/print-ip6opts.c b/print-ip6opts.c index 14ad42c3..355c37a5 100644 --- a/print-ip6opts.c +++ b/print-ip6opts.c @@ -27,7 +27,6 @@ * SUCH DAMAGE. */ -#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/print-ipcomp.c b/print-ipcomp.c index 1ba687e8..2504bfd9 100644 --- a/print-ipcomp.c +++ b/print-ipcomp.c @@ -19,7 +19,6 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ -#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/print-ipfc.c b/print-ipfc.c index 295ac0fd..6c92f901 100644 --- a/print-ipfc.c +++ b/print-ipfc.c @@ -19,7 +19,6 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ -#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/print-ipnet.c b/print-ipnet.c index c4ff16ab..6abc5c80 100644 --- a/print-ipnet.c +++ b/print-ipnet.c @@ -1,4 +1,3 @@ -#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/print-ipx.c b/print-ipx.c index 93f5d595..12ec7dcf 100644 --- a/print-ipx.c +++ b/print-ipx.c @@ -22,7 +22,6 @@ * Contributed by Brad Parker (brad@fcr.com). */ -#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/print-isakmp.c b/print-isakmp.c index bef0b45e..5267ad24 100644 --- a/print-isakmp.c +++ b/print-isakmp.c @@ -28,7 +28,6 @@ * */ -#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/print-isoclns.c b/print-isoclns.c index 6f113fee..03a7cce1 100644 --- a/print-isoclns.c +++ b/print-isoclns.c @@ -24,7 +24,6 @@ * complete IS-IS & CLNP support. */ -#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/print-juniper.c b/print-juniper.c index e4bb77c9..750f76ab 100644 --- a/print-juniper.c +++ b/print-juniper.c @@ -20,7 +20,6 @@ __RCSID("NetBSD: print-juniper.c,v 1.3 2007/07/25 06:31:32 dogcow Exp "); #endif -#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/print-krb.c b/print-krb.c index 2eebfa69..3b4798c6 100644 --- a/print-krb.c +++ b/print-krb.c @@ -21,7 +21,6 @@ * Initial contribution from John Hawkinson (jhawk@mit.edu). */ -#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/print-l2tp.c b/print-l2tp.c index 346dae9d..4ebc35ee 100644 --- a/print-l2tp.c +++ b/print-l2tp.c @@ -21,7 +21,6 @@ * L2TP support contributed by Motonori Shindo (mshindo@mshindo.net) */ -#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/print-lane.c b/print-lane.c index c1e0b2e8..1f10fab1 100644 --- a/print-lane.c +++ b/print-lane.c @@ -20,7 +20,6 @@ * */ -#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/print-ldp.c b/print-ldp.c index 3f741d13..cf421c43 100644 --- a/print-ldp.c +++ b/print-ldp.c @@ -14,7 +14,6 @@ * and Steinar Haug (sthaug@nethelp.no) */ -#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/print-llc.c b/print-llc.c index e8a3314c..fc838028 100644 --- a/print-llc.c +++ b/print-llc.c @@ -22,7 +22,6 @@ * with an awful lot of hacking by Jeffrey Mogul, DECWRL */ -#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/print-lldp.c b/print-lldp.c index ce3c0938..e4bed732 100644 --- a/print-lldp.c +++ b/print-lldp.c @@ -19,7 +19,6 @@ * DCBX extensions by Kaladhar Musunuru <kaladharm@sourceforge.net> */ -#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/print-lmp.c b/print-lmp.c index 904dd712..ca1d5cd0 100644 --- a/print-lmp.c +++ b/print-lmp.c @@ -17,7 +17,6 @@ * by Manu Pathak (mapathak@cisco.com), May 2005 */ -#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/print-loopback.c b/print-loopback.c index 9a74ae61..481cf6ee 100644 --- a/print-loopback.c +++ b/print-loopback.c @@ -30,7 +30,6 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/print-lspping.c b/print-lspping.c index 888adfaf..ae43fef3 100644 --- a/print-lspping.c +++ b/print-lspping.c @@ -13,7 +13,6 @@ * Original code by Hannes Gredler (hannes@juniper.net) */ -#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/print-lwapp.c b/print-lwapp.c index 5b8683f7..a6c05a39 100644 --- a/print-lwapp.c +++ b/print-lwapp.c @@ -17,7 +17,6 @@ * Original code by Carles Kishimoto <carles.kishimoto@gmail.com> */ -#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/print-lwres.c b/print-lwres.c index d78c9a90..c7f04685 100644 --- a/print-lwres.c +++ b/print-lwres.c @@ -27,7 +27,6 @@ * SUCH DAMAGE. */ -#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/print-m3ua.c b/print-m3ua.c index 33f87779..be7a30a4 100644 --- a/print-m3ua.c +++ b/print-m3ua.c @@ -22,7 +22,6 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/print-mobile.c b/print-mobile.c index df412eeb..b61d0f5d 100644 --- a/print-mobile.c +++ b/print-mobile.c @@ -36,7 +36,6 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/print-mobility.c b/print-mobility.c index 10af90b9..787d0409 100644 --- a/print-mobility.c +++ b/print-mobility.c @@ -27,7 +27,6 @@ * SUCH DAMAGE. */ -#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/print-mpcp.c b/print-mpcp.c index 9da3582d..e2b6c394 100644 --- a/print-mpcp.c +++ b/print-mpcp.c @@ -17,7 +17,6 @@ * Original code by Hannes Gredler (hannes@juniper.net) */ -#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/print-mpls.c b/print-mpls.c index bc34d506..03ff1b3e 100644 --- a/print-mpls.c +++ b/print-mpls.c @@ -26,7 +26,6 @@ * SUCH DAMAGE. */ -#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/print-mptcp.c b/print-mptcp.c index f85f1d24..947ffc4f 100644 --- a/print-mptcp.c +++ b/print-mptcp.c @@ -32,7 +32,6 @@ * SUCH DAMAGE. */ -#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/print-msdp.c b/print-msdp.c index fb802b58..16abc3ec 100644 --- a/print-msdp.c +++ b/print-msdp.c @@ -16,7 +16,6 @@ * FOR A PARTICULAR PURPOSE. */ -#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/print-msnlb.c b/print-msnlb.c index fcd00064..84089210 100644 --- a/print-msnlb.c +++ b/print-msnlb.c @@ -26,7 +26,6 @@ * SUCH DAMAGE. */ -#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/print-nflog.c b/print-nflog.c index 95da4cba..a29b930c 100644 --- a/print-nflog.c +++ b/print-nflog.c @@ -25,7 +25,6 @@ * DAMAGE. */ -#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/print-nfs.c b/print-nfs.c index dd2f7f12..e5f081a4 100644 --- a/print-nfs.c +++ b/print-nfs.c @@ -19,7 +19,6 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ -#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/print-ntp.c b/print-ntp.c index e83d47a7..c3ea82b6 100644 --- a/print-ntp.c +++ b/print-ntp.c @@ -23,7 +23,6 @@ * loosely based on print-bootp.c */ -#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/print-null.c b/print-null.c index 166f777d..8801e7b7 100644 --- a/print-null.c +++ b/print-null.c @@ -19,7 +19,6 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ -#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/print-olsr.c b/print-olsr.c index b90eea1a..73727313 100644 --- a/print-olsr.c +++ b/print-olsr.c @@ -19,7 +19,6 @@ * IPv6 additions by Florian Forster <octo at verplant.org> */ -#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/print-openflow-1.0.c b/print-openflow-1.0.c index a36c32f3..9fb0f635 100644 --- a/print-openflow-1.0.c +++ b/print-openflow-1.0.c @@ -56,7 +56,6 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/print-openflow.c b/print-openflow.c index 8825ae3d..0563edea 100644 --- a/print-openflow.c +++ b/print-openflow.c @@ -30,7 +30,6 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/print-ospf.c b/print-ospf.c index 3583417a..3e0d03c5 100644 --- a/print-ospf.c +++ b/print-ospf.c @@ -21,7 +21,6 @@ * OSPF support contributed by Jeffrey Honig (jch@mitchell.cit.cornell.edu) */ -#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/print-ospf6.c b/print-ospf6.c index 49210bc0..0d25baac 100644 --- a/print-ospf6.c +++ b/print-ospf6.c @@ -21,7 +21,6 @@ * OSPF support contributed by Jeffrey Honig (jch@mitchell.cit.cornell.edu) */ -#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/print-otv.c b/print-otv.c index 53a79dea..3255ddb0 100644 --- a/print-otv.c +++ b/print-otv.c @@ -13,7 +13,6 @@ * Original code by Francesco Fondelli (francesco dot fondelli, gmail dot com) */ -#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/print-pflog.c b/print-pflog.c index 72ae2763..0df10c84 100644 --- a/print-pflog.c +++ b/print-pflog.c @@ -19,7 +19,6 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ -#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/print-pgm.c b/print-pgm.c index 6a834253..58aa3469 100644 --- a/print-pgm.c +++ b/print-pgm.c @@ -13,7 +13,6 @@ * Original code by Andy Heffernan (ahh@juniper.net) */ -#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/print-pim.c b/print-pim.c index 15f4c513..a8bcdcf8 100644 --- a/print-pim.c +++ b/print-pim.c @@ -19,7 +19,6 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ -#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/print-pktap.c b/print-pktap.c index e376cc6e..2651cf8b 100644 --- a/print-pktap.c +++ b/print-pktap.c @@ -19,7 +19,6 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ -#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/print-ppi.c b/print-ppi.c index 06678b0f..9fa05208 100644 --- a/print-ppi.c +++ b/print-ppi.c @@ -1,7 +1,7 @@ /* * Oracle */ -#define NETDISSECT_REWORKED + #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/print-ppp.c b/print-ppp.c index edc03c02..d9bca84c 100644 --- a/print-ppp.c +++ b/print-ppp.c @@ -29,7 +29,6 @@ * o BAP support */ -#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/print-pppoe.c b/print-pppoe.c index 1624c5e5..8a2870a9 100644 --- a/print-pppoe.c +++ b/print-pppoe.c @@ -21,7 +21,6 @@ * Original code by Greg Stark <gsstark@mit.edu> */ -#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/print-pptp.c b/print-pptp.c index c77868d4..1691dc6a 100644 --- a/print-pptp.c +++ b/print-pptp.c @@ -21,7 +21,6 @@ * PPTP support contributed by Motonori Shindo (mshindo@mshindo.net) */ -#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/print-radius.c b/print-radius.c index 5cf8ad2b..c66c7938 100644 --- a/print-radius.c +++ b/print-radius.c @@ -48,7 +48,6 @@ * TODO: Among other things to print ok MacIntosh and Vendor values */ -#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/print-raw.c b/print-raw.c index d20387c6..74d63639 100644 --- a/print-raw.c +++ b/print-raw.c @@ -19,7 +19,6 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ -#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/print-rip.c b/print-rip.c index c1b036e4..e76c56f6 100644 --- a/print-rip.c +++ b/print-rip.c @@ -19,7 +19,6 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ -#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/print-ripng.c b/print-ripng.c index 4bc900d1..a0318d15 100644 --- a/print-ripng.c +++ b/print-ripng.c @@ -19,7 +19,6 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ -#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/print-rpki-rtr.c b/print-rpki-rtr.c index 3dc15d90..e2eaf94c 100644 --- a/print-rpki-rtr.c +++ b/print-rpki-rtr.c @@ -17,7 +17,6 @@ * Original code by Hannes Gredler (hannes@juniper.net) */ -#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/print-rrcp.c b/print-rrcp.c index 2370d9c2..cb177955 100644 --- a/print-rrcp.c +++ b/print-rrcp.c @@ -21,7 +21,6 @@ * and Realtek Echo Protocol (RRCP-REP) packets. */ -#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/print-rsvp.c b/print-rsvp.c index 263ef3d4..2c510f30 100644 --- a/print-rsvp.c +++ b/print-rsvp.c @@ -15,7 +15,6 @@ * Original code by Hannes Gredler (hannes@juniper.net) */ -#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/print-rt6.c b/print-rt6.c index 3d5f9e37..baa6945e 100644 --- a/print-rt6.c +++ b/print-rt6.c @@ -19,7 +19,6 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ -#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif @@ -32,7 +32,6 @@ * Ken Hornstein <kenh@cmf.nrl.navy.mil> */ -#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/print-sctp.c b/print-sctp.c index 4b595f2e..d48202f5 100644 --- a/print-sctp.c +++ b/print-sctp.c @@ -33,7 +33,6 @@ * SUCH DAMAGE. */ -#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/print-sflow.c b/print-sflow.c index 24112f44..708f7605 100644 --- a/print-sflow.c +++ b/print-sflow.c @@ -19,7 +19,6 @@ * Expansion and refactoring by Rick Jones <rick.jones2@hp.com> */ -#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/print-sip.c b/print-sip.c index d0fd349f..5c5d1fec 100644 --- a/print-sip.c +++ b/print-sip.c @@ -15,7 +15,6 @@ * Guy Harris. */ -#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif @@ -19,7 +19,6 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ -#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/print-sll.c b/print-sll.c index 1f5f6008..76b4e95f 100644 --- a/print-sll.c +++ b/print-sll.c @@ -19,7 +19,6 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ -#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/print-slow.c b/print-slow.c index 2db3581e..968534e5 100644 --- a/print-slow.c +++ b/print-slow.c @@ -18,7 +18,6 @@ * Original code by Hannes Gredler (hannes@juniper.net) */ -#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/print-smb.c b/print-smb.c index f5be9ffc..b8c5d9d5 100644 --- a/print-smb.c +++ b/print-smb.c @@ -6,7 +6,6 @@ * or later */ -#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/print-snmp.c b/print-snmp.c index f5501582..04654f45 100644 --- a/print-snmp.c +++ b/print-snmp.c @@ -56,7 +56,6 @@ # @(#)snmp.awk.x 1.1 (LANL) 1/15/90 */ -#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/print-stp.c b/print-stp.c index 93bb6000..a89932d6 100644 --- a/print-stp.c +++ b/print-stp.c @@ -9,7 +9,6 @@ * Contributed by Lennert Buytenhek <buytenh@gnu.org> */ -#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/print-sunatm.c b/print-sunatm.c index fc03d42a..d22e83a4 100644 --- a/print-sunatm.c +++ b/print-sunatm.c @@ -30,7 +30,6 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/print-sunrpc.c b/print-sunrpc.c index bc7138de..1bca04e4 100644 --- a/print-sunrpc.c +++ b/print-sunrpc.c @@ -19,7 +19,6 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ -#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/print-symantec.c b/print-symantec.c index dcff2a66..665dbcc2 100644 --- a/print-symantec.c +++ b/print-symantec.c @@ -19,7 +19,6 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ -#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/print-syslog.c b/print-syslog.c index 5e3cd4f7..2d481815 100644 --- a/print-syslog.c +++ b/print-syslog.c @@ -14,7 +14,6 @@ * FOR A PARTICULAR PURPOSE. */ -#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/print-tcp.c b/print-tcp.c index bc200e2f..466fc48e 100644 --- a/print-tcp.c +++ b/print-tcp.c @@ -28,7 +28,6 @@ __RCSID("$NetBSD: print-tcp.c,v 1.8 2007/07/24 11:53:48 drochner Exp $"); #endif -#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/print-telnet.c b/print-telnet.c index fa59b1fe..b3f17ed2 100644 --- a/print-telnet.c +++ b/print-telnet.c @@ -45,7 +45,6 @@ * are preserved in all copies. */ -#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/print-tftp.c b/print-tftp.c index 9b88e74f..acb8ca9d 100644 --- a/print-tftp.c +++ b/print-tftp.c @@ -21,7 +21,6 @@ * Format and print trivial file transfer protocol packets. */ -#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/print-timed.c b/print-timed.c index 5830bc7b..1d8c5804 100644 --- a/print-timed.c +++ b/print-timed.c @@ -19,7 +19,6 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ -#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/print-tipc.c b/print-tipc.c index b883fba9..f75d9f23 100644 --- a/print-tipc.c +++ b/print-tipc.c @@ -19,7 +19,6 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ -#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/print-token.c b/print-token.c index b88bcf79..33647a14 100644 --- a/print-token.c +++ b/print-token.c @@ -24,7 +24,6 @@ * Guy Harris <guy@alum.mit.edu> */ -#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/print-udld.c b/print-udld.c index 15e2bf6f..fd6fdf91 100644 --- a/print-udld.c +++ b/print-udld.c @@ -18,7 +18,6 @@ * Original code by Carles Kishimoto <carles.kishimoto@gmail.com> */ -#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/print-udp.c b/print-udp.c index c3edf6ef..17816121 100644 --- a/print-udp.c +++ b/print-udp.c @@ -19,7 +19,6 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ -#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/print-usb.c b/print-usb.c index 75f78fc9..d0ad6141 100644 --- a/print-usb.c +++ b/print-usb.c @@ -19,7 +19,6 @@ * */ -#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/print-vjc.c b/print-vjc.c index 24f8a122..fc7aafa9 100644 --- a/print-vjc.c +++ b/print-vjc.c @@ -19,7 +19,6 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ -#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/print-vqp.c b/print-vqp.c index ce3572ac..45150b6d 100644 --- a/print-vqp.c +++ b/print-vqp.c @@ -17,7 +17,6 @@ * Original code by Carles Kishimoto <Carles.Kishimoto@bsc.es> */ -#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/print-vrrp.c b/print-vrrp.c index f739d1ed..30f89d34 100644 --- a/print-vrrp.c +++ b/print-vrrp.c @@ -23,7 +23,6 @@ * FOR A PARTICULAR PURPOSE. */ -#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/print-vtp.c b/print-vtp.c index 9fe86e3c..b771c643 100644 --- a/print-vtp.c +++ b/print-vtp.c @@ -22,7 +22,6 @@ * Original code ode by Carles Kishimoto <carles.kishimoto@gmail.com> */ -#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/print-vxlan.c b/print-vxlan.c index c4de68d5..c123b4ce 100644 --- a/print-vxlan.c +++ b/print-vxlan.c @@ -13,7 +13,6 @@ * Original code by Francesco Fondelli (francesco dot fondelli, gmail dot com) */ -#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif @@ -19,7 +19,6 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ -#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/print-zephyr.c b/print-zephyr.c index 8132c49a..c004f144 100644 --- a/print-zephyr.c +++ b/print-zephyr.c @@ -20,7 +20,6 @@ * PURPOSE. */ -#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/print-zeromq.c b/print-zeromq.c index ba22c96e..b7302035 100644 --- a/print-zeromq.c +++ b/print-zeromq.c @@ -28,7 +28,6 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/signature.c b/signature.c index 324035fb..84a3a64d 100644 --- a/signature.c +++ b/signature.c @@ -15,7 +15,6 @@ * Original code by Hannes Gredler (hannes@juniper.net) */ -#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif @@ -6,7 +6,6 @@ * or later */ -#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif @@ -507,7 +507,7 @@ show_dlts_and_exit(const char *device, pcap_t *pd) if (supports_monitor_mode) (void) fprintf(stderr, "Data link types for %s %s (use option -y to set):\n", device, - Iflag ? "when in monitor mode" : "when not in monitor mode"); + gndo->ndo_Iflag ? "when in monitor mode" : "when not in monitor mode"); else (void) fprintf(stderr, "Data link types for %s (use option -y to set):\n", device); @@ -790,11 +790,11 @@ MakeFilename(char *buffer, char *orig_name, int cnt, int max_chars) error("Makefilename: malloc"); /* Process with strftime if Gflag is set. */ - if (Gflag != 0) { + if (gndo->ndo_Gflag != 0) { struct tm *local_tm; /* Convert Gflag_time to a usable format */ - if ((local_tm = localtime(&Gflag_time)) == NULL) { + if ((local_tm = localtime(&gndo->ndo_Gflag_time)) == NULL) { error("MakeTimedFilename: localtime"); } @@ -1001,7 +1001,7 @@ main(int argc, char **argv) if(wsockinit() != 0) return 1; #endif /* WIN32 */ - jflag=-1; /* not set */ + gndo->ndo_jflag=-1; /* not set */ gndo->ndo_Oflag=1; gndo->ndo_Rflag=1; gndo->ndo_dlt=-1; @@ -1048,17 +1048,17 @@ main(int argc, char **argv) break; case 'A': - ++Aflag; + ++gndo->ndo_Aflag; break; case 'b': - ++bflag; + ++gndo->ndo_bflag; break; #if defined(HAVE_PCAP_CREATE) || defined(WIN32) case 'B': - Bflag = atoi(optarg)*1024; - if (Bflag <= 0) + gndo->ndo_Bflag = atoi(optarg)*1024; + if (gndo->ndo_Bflag <= 0) error("invalid packet buffer size %s", optarg); break; #endif /* defined(HAVE_PCAP_CREATE) || defined(WIN32) */ @@ -1070,8 +1070,8 @@ main(int argc, char **argv) break; case 'C': - Cflag = atoi(optarg) * 1000000; - if (Cflag < 0) + gndo->ndo_Cflag = atoi(optarg) * 1000000; + if (gndo->ndo_Cflag < 0) error("invalid file size %s", optarg); break; @@ -1088,7 +1088,7 @@ main(int argc, char **argv) break; case 'e': - ++eflag; + ++gndo->ndo_eflag; break; case 'E': @@ -1099,7 +1099,7 @@ main(int argc, char **argv) break; case 'f': - ++fflag; + ++gndo->ndo_fflag; break; case 'F': @@ -1107,15 +1107,15 @@ main(int argc, char **argv) break; case 'G': - Gflag = atoi(optarg); - if (Gflag < 0) + gndo->ndo_Gflag = atoi(optarg); + if (gndo->ndo_Gflag < 0) error("invalid number of seconds %s", optarg); /* We will create one file initially. */ - Gflag_count = 0; + gndo->ndo_Gflag_count = 0; /* Grab the current time for rotation use. */ - if ((Gflag_time = time(NULL)) == (time_t)-1) { + if ((gndo->ndo_Gflag_time = time(NULL)) == (time_t)-1) { error("main: can't get current time: %s", pcap_strerror(errno)); } @@ -1127,7 +1127,7 @@ main(int argc, char **argv) break; case 'H': - ++Hflag; + ++gndo->ndo_Hflag; break; case 'i': @@ -1174,14 +1174,14 @@ main(int argc, char **argv) #ifdef HAVE_PCAP_CREATE case 'I': - ++Iflag; + ++gndo->ndo_Iflag; break; #endif /* HAVE_PCAP_CREATE */ #ifdef HAVE_PCAP_SET_TSTAMP_TYPE case 'j': - jflag = pcap_tstamp_type_name_to_val(optarg); - if (jflag < 0) + gndo->ndo_jflag = pcap_tstamp_type_name_to_val(optarg); + if (gndo->ndo_jflag < 0) error("invalid time stamp type %s", optarg); break; @@ -1212,7 +1212,7 @@ main(int argc, char **argv) break; case 'K': - ++Kflag; + ++gndo->ndo_Kflag; break; case 'm': @@ -1233,28 +1233,28 @@ main(int argc, char **argv) #ifndef HAVE_LIBCRYPTO warning("crypto code not compiled in"); #endif - sigsecret = optarg; + gndo->ndo_sigsecret = optarg; break; case 'n': - ++nflag; + ++gndo->ndo_nflag; break; case 'N': - ++Nflag; + ++gndo->ndo_Nflag; break; case 'O': - Oflag = 0; + gndo->ndo_Oflag = 0; break; case 'p': - ++pflag; + ++gndo->ndo_pflag; break; case 'q': - ++qflag; - ++suppress_default_print; + ++gndo->ndo_qflag; + ++gndo->ndo_suppress_default_print; break; #ifdef HAVE_PCAP_SETDIRECTION @@ -1275,75 +1275,75 @@ main(int argc, char **argv) break; case 'R': - Rflag = 0; + gndo->ndo_Rflag = 0; break; case 's': - snaplen = strtol(optarg, &end, 0); + gndo->ndo_snaplen = strtol(optarg, &end, 0); if (optarg == end || *end != '\0' - || snaplen < 0 || snaplen > MAXIMUM_SNAPLEN) + || gndo->ndo_snaplen < 0 || gndo->ndo_snaplen > MAXIMUM_SNAPLEN) error("invalid snaplen %s", optarg); - else if (snaplen == 0) - snaplen = MAXIMUM_SNAPLEN; + else if (gndo->ndo_snaplen == 0) + gndo->ndo_snaplen = MAXIMUM_SNAPLEN; break; case 'S': - ++Sflag; + ++gndo->ndo_Sflag; break; case 't': - ++tflag; + ++gndo->ndo_tflag; break; case 'T': if (strcasecmp(optarg, "vat") == 0) - packettype = PT_VAT; + gndo->ndo_packettype = PT_VAT; else if (strcasecmp(optarg, "wb") == 0) - packettype = PT_WB; + gndo->ndo_packettype = PT_WB; else if (strcasecmp(optarg, "rpc") == 0) - packettype = PT_RPC; + gndo->ndo_packettype = PT_RPC; else if (strcasecmp(optarg, "rtp") == 0) - packettype = PT_RTP; + gndo->ndo_packettype = PT_RTP; else if (strcasecmp(optarg, "rtcp") == 0) - packettype = PT_RTCP; + gndo->ndo_packettype = PT_RTCP; else if (strcasecmp(optarg, "snmp") == 0) - packettype = PT_SNMP; + gndo->ndo_packettype = PT_SNMP; else if (strcasecmp(optarg, "cnfp") == 0) - packettype = PT_CNFP; + gndo->ndo_packettype = PT_CNFP; else if (strcasecmp(optarg, "tftp") == 0) - packettype = PT_TFTP; + gndo->ndo_packettype = PT_TFTP; else if (strcasecmp(optarg, "aodv") == 0) - packettype = PT_AODV; + gndo->ndo_packettype = PT_AODV; else if (strcasecmp(optarg, "carp") == 0) - packettype = PT_CARP; + gndo->ndo_packettype = PT_CARP; else if (strcasecmp(optarg, "radius") == 0) - packettype = PT_RADIUS; + gndo->ndo_packettype = PT_RADIUS; else if (strcasecmp(optarg, "zmtp1") == 0) - packettype = PT_ZMTP1; + gndo->ndo_packettype = PT_ZMTP1; else if (strcasecmp(optarg, "vxlan") == 0) - packettype = PT_VXLAN; + gndo->ndo_packettype = PT_VXLAN; else if (strcasecmp(optarg, "pgm") == 0) - packettype = PT_PGM; + gndo->ndo_packettype = PT_PGM; else if (strcasecmp(optarg, "pgm_zmtp1") == 0) - packettype = PT_PGM_ZMTP1; + gndo->ndo_packettype = PT_PGM_ZMTP1; else if (strcasecmp(optarg, "lmp") == 0) - packettype = PT_LMP; + gndo->ndo_packettype = PT_LMP; else error("unknown packet type `%s'", optarg); break; case 'u': - ++uflag; + ++gndo->ndo_uflag; break; #ifdef HAVE_PCAP_DUMP_FLUSH case 'U': - ++Uflag; + ++gndo->ndo_Uflag; break; #endif case 'v': - ++vflag; + ++gndo->ndo_vflag; break; case 'V': @@ -1355,20 +1355,20 @@ main(int argc, char **argv) break; case 'W': - Wflag = atoi(optarg); - if (Wflag < 0) + gndo->ndo_Wflag = atoi(optarg); + if (gndo->ndo_Wflag < 0) error("invalid number of output files %s", optarg); - WflagChars = getWflagChars(Wflag); + gndo->ndo_WflagChars = getWflagChars(gndo->ndo_Wflag); break; case 'x': - ++xflag; - ++suppress_default_print; + ++gndo->ndo_xflag; + ++gndo->ndo_suppress_default_print; break; case 'X': - ++Xflag; - ++suppress_default_print; + ++gndo->ndo_Xflag; + ++gndo->ndo_suppress_default_print; break; case 'y': @@ -1435,7 +1435,7 @@ main(int argc, char **argv) show_devices_and_exit(); #endif - switch (tflag) { + switch (gndo->ndo_tflag) { case 0: /* Default */ case 4: /* Default + Date*/ @@ -1453,7 +1453,7 @@ main(int argc, char **argv) break; } - if (fflag != 0 && (VFileName != NULL || RFileName != NULL)) + if (gndo->ndo_fflag != 0 && (VFileName != NULL || RFileName != NULL)) error("-f can not be used with -V or -r"); if (VFileName != NULL && RFileName != NULL) @@ -1611,15 +1611,15 @@ main(int argc, char **argv) supports_monitor_mode = 1; else supports_monitor_mode = 0; - status = pcap_set_snaplen(pd, snaplen); + status = pcap_set_snaplen(pd, gndo->ndo_snaplen); if (status != 0) error("%s: Can't set snapshot length: %s", device, pcap_statustostr(status)); - status = pcap_set_promisc(pd, !pflag); + status = pcap_set_promisc(pd, !gndo->ndo_pflag); if (status != 0) error("%s: Can't set promiscuous mode: %s", device, pcap_statustostr(status)); - if (Iflag) { + if (gndo->ndo_Iflag) { status = pcap_set_rfmon(pd, 1); if (status != 0) error("%s: Can't set monitor mode: %s", @@ -1629,15 +1629,15 @@ main(int argc, char **argv) if (status != 0) error("%s: pcap_set_timeout failed: %s", device, pcap_statustostr(status)); - if (Bflag != 0) { - status = pcap_set_buffer_size(pd, Bflag); + if (gndo->ndo_Bflag != 0) { + status = pcap_set_buffer_size(pd, gndo->ndo_Bflag); if (status != 0) error("%s: Can't set buffer size: %s", device, pcap_statustostr(status)); } #ifdef HAVE_PCAP_SET_TSTAMP_TYPE - if (jflag != -1) { - status = pcap_set_tstamp_type(pd, jflag); + if (gndo->ndo_jflag != -1) { + status = pcap_set_tstamp_type(pd, gndo->ndo_jflag); if (status < 0) error("%s: Can't set time stamp type: %s", device, pcap_statustostr(status)); @@ -1726,11 +1726,11 @@ main(int argc, char **argv) (void)fflush(stderr); } i = pcap_snapshot(pd); - if (snaplen < i) { - warning("snaplen raised from %d to %d", snaplen, i); - snaplen = i; + if (gndo->ndo_snaplen < i) { + warning("snaplen raised from %d to %d", gndo->ndo_snaplen, i); + gndo->ndo_snaplen = i; } - if(fflag != 0) { + if(gndo->ndo_fflag != 0) { if (pcap_lookupnet(device, &localnet, &netmask, ebuf) < 0) { warning("foreign (-f) flag used but: %s", ebuf); } @@ -1742,7 +1742,7 @@ main(int argc, char **argv) else cmdbuf = copy_argv(&argv[optind]); - if (pcap_compile(pd, &fcode, cmdbuf, Oflag, netmask) < 0) + if (pcap_compile(pd, &fcode, cmdbuf, gndo->ndo_Oflag, netmask) < 0) error("%s", pcap_geterr(pd)); if (dflag) { bpf_dump(&fcode, dflag); @@ -1840,8 +1840,8 @@ main(int argc, char **argv) error("malloc of dumpinfo.CurrentFileName"); /* We do not need numbering for dumpfiles if Cflag isn't set. */ - if (Cflag != 0) - MakeFilename(dumpinfo.CurrentFileName, WFileName, 0, WflagChars); + if (gndo->ndo_Cflag != 0) + MakeFilename(dumpinfo.CurrentFileName, WFileName, 0, gndo->ndo_WflagChars); else MakeFilename(dumpinfo.CurrentFileName, WFileName, 0, 0); @@ -1853,7 +1853,7 @@ main(int argc, char **argv) */ capng_update( CAPNG_DROP, - (Cflag || Gflag ? 0 : CAPNG_PERMITTED) + (gndo->ndo_Cflag || gndo->ndo_Gflag ? 0 : CAPNG_PERMITTED) | CAPNG_EFFECTIVE, CAP_DAC_OVERRIDE ); @@ -1864,7 +1864,7 @@ main(int argc, char **argv) #ifdef HAVE_CAPSICUM set_dumper_capsicum_rights(p); #endif - if (Cflag != 0 || Gflag != 0) { + if (gndo->ndo_Cflag != 0 || gndo->ndo_Gflag != 0) { #ifdef HAVE_CAPSICUM dumpinfo.WFileName = strdup(basename(WFileName)); dumpinfo.dirfd = open(dirname(WFileName), @@ -1895,7 +1895,7 @@ main(int argc, char **argv) pcap_userdata = (u_char *)p; } #ifdef HAVE_PCAP_DUMP_FLUSH - if (Uflag) + if (gndo->ndo_Uflag) pcap_dump_flush(p); #endif } else { @@ -1914,7 +1914,7 @@ main(int argc, char **argv) (void)setsignal(SIGNAL_REQ_INFO, requestinfo); #endif - if (vflag > 0 && WFileName) { + if (gndo->ndo_vflag > 0 && WFileName) { /* * When capturing to a file, "-v" means tcpdump should, * every 10 secodns, "v"erbosely report the number of @@ -1937,7 +1937,7 @@ main(int argc, char **argv) * to a file from the -V file). Print a message to * the standard error on UN*X. */ - if (!vflag && !WFileName) { + if (!gndo->ndo_vflag && !WFileName) { (void)fprintf(stderr, "%s: verbose output suppressed, use -v or -vv for full protocol decode\n", program_name); @@ -1947,11 +1947,11 @@ main(int argc, char **argv) dlt_name = pcap_datalink_val_to_name(dlt); if (dlt_name == NULL) { (void)fprintf(stderr, "listening on %s, link-type %u, capture size %u bytes\n", - device, dlt, snaplen); + device, dlt, gndo->ndo_snaplen); } else { (void)fprintf(stderr, "listening on %s, link-type %s (%s), capture size %u bytes\n", device, dlt_name, - pcap_datalink_val_to_description(dlt), snaplen); + pcap_datalink_val_to_description(dlt), gndo->ndo_snaplen); } (void)fflush(stderr); } @@ -2033,7 +2033,7 @@ main(int argc, char **argv) RFileName, dlt_name, pcap_datalink_val_to_description(new_dlt)); } - if (pcap_compile(pd, &fcode, cmdbuf, Oflag, netmask) < 0) + if (pcap_compile(pd, &fcode, cmdbuf, gndo->ndo_Oflag, netmask) < 0) error("%s", pcap_geterr(pd)); if (pcap_setfilter(pd, &fcode) < 0) error("%s", pcap_geterr(pd)); @@ -2202,7 +2202,7 @@ dump_packet_and_trunc(u_char *user, const struct pcap_pkthdr *h, const u_char *s * first thereby cancelling the Cflag boundary (since the file should * be 0). */ - if (Gflag != 0) { + if (gndo->ndo_Gflag != 0) { /* Check if it is time to rotate */ time_t t; @@ -2214,16 +2214,16 @@ dump_packet_and_trunc(u_char *user, const struct pcap_pkthdr *h, const u_char *s /* If the time is greater than the specified window, rotate */ - if (t - Gflag_time >= Gflag) { + if (t - gndo->ndo_Gflag_time >= gndo->ndo_Gflag) { #ifdef HAVE_CAPSICUM FILE *fp; int fd; #endif /* Update the Gflag_time */ - Gflag_time = t; + gndo->ndo_Gflag_time = t; /* Update Gflag_count */ - Gflag_count++; + gndo->ndo_Gflag_count++; /* * Close the current file and open a new one. */ @@ -2239,9 +2239,9 @@ dump_packet_and_trunc(u_char *user, const struct pcap_pkthdr *h, const u_char *s * Check to see if we've exceeded the Wflag (when * not using Cflag). */ - if (Cflag == 0 && Wflag > 0 && Gflag_count >= Wflag) { + if (gndo->ndo_Cflag == 0 && gndo->ndo_Wflag > 0 && gndo->ndo_Gflag_count >= gndo->ndo_Wflag) { (void)fprintf(stderr, "Maximum file limit reached: %d\n", - Wflag); + gndo->ndo_Wflag); exit(0); /* NOTREACHED */ } @@ -2256,16 +2256,16 @@ dump_packet_and_trunc(u_char *user, const struct pcap_pkthdr *h, const u_char *s * so multiple files would end with 1,2,3 in the filename. * The counting is handled with the -C flow after this. */ - Cflag_count = 0; + gndo->ndo_Cflag_count = 0; /* * This is always the first file in the Cflag * rotation: e.g. 0 * We also don't need numbering if Cflag is not set. */ - if (Cflag != 0) + if (gndo->ndo_Cflag != 0) MakeFilename(dump_info->CurrentFileName, dump_info->WFileName, 0, - WflagChars); + gndo->ndo_WflagChars); else MakeFilename(dump_info->CurrentFileName, dump_info->WFileName, 0, 0); @@ -2307,12 +2307,12 @@ dump_packet_and_trunc(u_char *user, const struct pcap_pkthdr *h, const u_char *s * larger than Cflag - the last packet written to the * file could put it over Cflag. */ - if (Cflag != 0) { + if (gndo->ndo_Cflag != 0) { long size = pcap_dump_ftell(dump_info->p); if (size == -1) error("ftell fails on output file"); - if (size > Cflag) { + if (size > gndo->ndo_Cflag) { #ifdef HAVE_CAPSICUM FILE *fp; int fd; @@ -2330,17 +2330,17 @@ dump_packet_and_trunc(u_char *user, const struct pcap_pkthdr *h, const u_char *s if (zflag != NULL) compress_savefile(dump_info->CurrentFileName); - Cflag_count++; - if (Wflag > 0) { - if (Cflag_count >= Wflag) - Cflag_count = 0; + gndo->ndo_Cflag_count++; + if (gndo->ndo_Wflag > 0) { + if (gndo->ndo_Cflag_count >= gndo->ndo_Wflag) + gndo->ndo_Cflag_count = 0; } if (dump_info->CurrentFileName != NULL) free(dump_info->CurrentFileName); dump_info->CurrentFileName = (char *)malloc(PATH_MAX + 1); if (dump_info->CurrentFileName == NULL) error("dump_packet_and_trunc: malloc"); - MakeFilename(dump_info->CurrentFileName, dump_info->WFileName, Cflag_count, WflagChars); + MakeFilename(dump_info->CurrentFileName, dump_info->WFileName, gndo->ndo_Cflag_count, gndo->ndo_WflagChars); #ifdef HAVE_LIBCAP_NG capng_update(CAPNG_ADD, CAPNG_EFFECTIVE, CAP_DAC_OVERRIDE); capng_apply(CAPNG_SELECT_BOTH); @@ -2375,7 +2375,7 @@ dump_packet_and_trunc(u_char *user, const struct pcap_pkthdr *h, const u_char *s pcap_dump((u_char *)dump_info->p, h, sp); #ifdef HAVE_PCAP_DUMP_FLUSH - if (Uflag) + if (gndo->ndo_Uflag) pcap_dump_flush(dump_info->p); #endif @@ -2393,7 +2393,7 @@ dump_packet(u_char *user, const struct pcap_pkthdr *h, const u_char *sp) pcap_dump(user, h, sp); #ifdef HAVE_PCAP_DUMP_FLUSH - if (Uflag) + if (gndo->ndo_Uflag) pcap_dump_flush((pcap_dumper_t *)user); #endif @@ -35,7 +35,6 @@ * FOR A PARTICULAR PURPOSE. */ -#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif |