dismiss NETDISSECT_REWORKED macro

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.

diff --git a/addrtoname.c b/addrtoname.c
index 6d957389ba4ac3a9d86aae3232b4a92e7a92b152..e131958302f4b0e5aea2c235deb1bece77280e98 100644 (file)
--- a/addrtoname.c
+++ b/addrtoname.c
@@ -22,7 +22,6 @@
  *  and address to string conversion routines
  */
 
  *  and address to string conversion routines
  */
 

-#define NETDISSECT_REWORKED

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/af.c b/af.c
index bea6d977763fcddd0798f1856965dacffff65672..2a2159d75bb77ba299f3da215f073eac3b9b4296 100644 (file)
--- a/af.c
+++ b/af.c
@@ -15,7 +15,6 @@
  * Original code by Hannes Gredler ([email protected])
  */
 
  * Original code by Hannes Gredler ([email protected])
  */
 

-#define NETDISSECT_REWORKED

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/bpf_dump.c b/bpf_dump.c
index 2ef852834085d882777dd25d4324bb26eda8ce6f..05ae760a8f29e0a0005e0d82d47114cd4fae55a5 100644 (file)
--- a/bpf_dump.c
+++ b/bpf_dump.c
@@ -19,7 +19,6 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 

-#define NETDISSECT_REWORKED

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/checksum.c b/checksum.c
index d8263c7a244a63002e55d52f9dff21446fb98ba0..1d771365e581df7cd3fc1cba7503777898bd7d5d 100644 (file)
--- a/checksum.c
+++ b/checksum.c
@@ -17,7 +17,6 @@
  * Original code by Hannes Gredler ([email protected])
  */
 
  * Original code by Hannes Gredler ([email protected])
  */
 

-#define NETDISSECT_REWORKED

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/cpack.c b/cpack.c
index 16bfd151698e8c195193a1880944f74c6e3f538f..88028a3dd6fb3054a0dd8c38bb260c8b6701ca2b 100644 (file)
--- a/cpack.c
+++ b/cpack.c
@@ -27,7 +27,6 @@
  * OF SUCH DAMAGE.
  */
 
  * OF SUCH DAMAGE.
  */
 

-#define NETDISSECT_REWORKED

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/gmpls.c b/gmpls.c
index c9fd9bb8ac6c56db6af7315bdc73f28ba6bd79d8..b4837a1eb58db6a44e6de1f6bf3c3ea1964b0302 100644 (file)
--- a/gmpls.c
+++ b/gmpls.c
@@ -13,7 +13,6 @@
  * Original code by Hannes Gredler ([email protected])
  */
 
  * Original code by Hannes Gredler ([email protected])
  */
 

-#define NETDISSECT_REWORKED

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/gmt2local.c b/gmt2local.c
index 6958f66a464019ddfcf44890d86016011159889f..2ab9c102d4fc9e4ac07ded917c1254fb816b7cdd 100644 (file)
--- a/gmt2local.c
+++ b/gmt2local.c
@@ -19,7 +19,6 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 

-#define NETDISSECT_REWORKED

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/in_cksum.c b/in_cksum.c
index 171728a88ceb14a96e340c1e283d9ecb88c823d3..efbc38e0bf37cd12638319ba9524c635db9227ee 100644 (file)
--- a/in_cksum.c
+++ b/in_cksum.c
@@ -35,7 +35,6 @@
  *     @(#)in_cksum.c  8.1 (Berkeley) 6/10/93
  */
 
  *     @(#)in_cksum.c  8.1 (Berkeley) 6/10/93
  */
 

-#define NETDISSECT_REWORKED

 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif

diff --git a/interface.h b/interface.h
index 2389c2e1e1ab9f1d26f39fac65789e76b3305b35..f033fc71808b5d0ed3c43fb64c952f29d22f2962 100644 (file)
--- a/interface.h
+++ b/interface.h
@@ -150,48 +150,3 @@ extern void bpf_dump(const struct bpf_program *, int);
 #endif
 
 #include "netdissect.h"
 #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

diff --git a/ipproto.c b/ipproto.c
index e44b74814bb4ea564a907f105ffb8370046122e7..8143eda8d2e73b9b044f87419a7e3e5de63f453e 100644 (file)
--- a/ipproto.c
+++ b/ipproto.c
@@ -13,7 +13,6 @@
  * Original code by Hannes Gredler ([email protected])
  */
 
  * Original code by Hannes Gredler ([email protected])
  */
 

-#define NETDISSECT_REWORKED

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/l2vpn.c b/l2vpn.c
index 54037aa19bc35391a6758006a259dc1e95fecec2..e9b72fff502269bd6d9cb7732c4921c66411c776 100644 (file)
--- a/l2vpn.c
+++ b/l2vpn.c
@@ -13,7 +13,6 @@
  * Original code by Hannes Gredler ([email protected])
  */
 
  * Original code by Hannes Gredler ([email protected])
  */
 

-#define NETDISSECT_REWORKED

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/nlpid.c b/nlpid.c
index 919e87dd4ae8cc1faf683b4c8e2cf1409dddc8dd..b9d59c4c8212d3ad5eee5652cbd332c8abb88bc2 100644 (file)
--- a/nlpid.c
+++ b/nlpid.c
@@ -13,7 +13,6 @@
  * Original code by Hannes Gredler ([email protected])
  */
 
  * Original code by Hannes Gredler ([email protected])
  */
 

-#define NETDISSECT_REWORKED

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/oui.c b/oui.c
index 2aea5ad74d0ac5c9824bc5396210841dfaec93ac..d29a6016777b25a1d04da8d9fcd5a17e2d6543bd 100644 (file)
--- a/oui.c
+++ b/oui.c
@@ -13,7 +13,6 @@
  * Original code by Hannes Gredler ([email protected])
  */
 
  * Original code by Hannes Gredler ([email protected])
  */
 

-#define NETDISSECT_REWORKED

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/parsenfsfh.c b/parsenfsfh.c
index 826ca94e4c5ccddefa8f431526460cf4bf5566da..4d14f3d63e0dcb647643faaea518b21607d8a6fe 100644 (file)
--- a/parsenfsfh.c
+++ b/parsenfsfh.c
@@ -40,7 +40,6 @@
  * Western Research Laboratory
  */
 
  * Western Research Laboratory
  */
 

-#define NETDISSECT_REWORKED

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/print-802_11.c b/print-802_11.c
index 697e2c92600078769cf449b9d913fd52d14fc6c4..5438c7be4aa405f174222d1c9633467978dac82e 100644 (file)
--- a/print-802_11.c
+++ b/print-802_11.c
@@ -20,7 +20,6 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 

-#define NETDISSECT_REWORKED

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/print-802_15_4.c b/print-802_15_4.c
index 26c28ee652aa6e71c48d68e3154e1cb043acb73b..b41e15ac56168bd045922670a2b41bef9b663326 100644 (file)
--- a/print-802_15_4.c
+++ b/print-802_15_4.c
@@ -20,7 +20,6 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 

-#define NETDISSECT_REWORKED

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/print-ah.c b/print-ah.c
index 0badf48233bffc1b915278c12529d9e779009735..015967caf8361a9fea24a927cb15328c28e6e521 100644 (file)
--- a/print-ah.c
+++ b/print-ah.c
@@ -21,7 +21,6 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 

-#define NETDISSECT_REWORKED

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/print-ahcp.c b/print-ahcp.c
index a9ae38a972334cfafd0302a46cbb67a047d8fb9a..7c69e7b34f4ea576091b9c762a0ea79c5ea65875 100644 (file)
--- a/print-ahcp.c
+++ b/print-ahcp.c
@@ -29,7 +29,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
  * POSSIBILITY OF SUCH DAMAGE.
  */
 

-#define NETDISSECT_REWORKED

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/print-aodv.c b/print-aodv.c
index ef27eee6bc2d57f31cfd76073f06e3adc75a28fd..a29fef50e19c631669a008465bb65732b3bbb287 100644 (file)
--- a/print-aodv.c
+++ b/print-aodv.c
@@ -30,7 +30,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
  * POSSIBILITY OF SUCH DAMAGE.
  */
 

-#define NETDISSECT_REWORKED

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/print-aoe.c b/print-aoe.c
index f8bc1fc9b990e539b9d78570955831d35fe16a02..a1dfc66b66ae562d20c81b90a0b77043dafd11ea 100644 (file)
--- a/print-aoe.c
+++ b/print-aoe.c
@@ -29,7 +29,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
  * POSSIBILITY OF SUCH DAMAGE.
  */
 

-#define NETDISSECT_REWORKED

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/print-ap1394.c b/print-ap1394.c
index 3befe2335bd0fc36e2f6e61cd8edc2a6664d478f..4f70faefd054f0dec3dac1a9d6c75256e9b65a1c 100644 (file)
--- a/print-ap1394.c
+++ b/print-ap1394.c
@@ -19,7 +19,6 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 

-#define NETDISSECT_REWORKED

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/print-arcnet.c b/print-arcnet.c
index 0ffb9220709b6253b372d3ccb59b0284dbffa7f7..cd6f5d9a996fd46bb2d766c2eb7bf723a1944548 100644 (file)
--- 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
  */
 
  * 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
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/print-arp.c b/print-arp.c
index 76f39fe084a681e1c8a5c8e32cf9d01d6fabbc7e..b54a30f0e554523bbd485823975e430f299e0981 100644 (file)
--- a/print-arp.c
+++ b/print-arp.c
@@ -19,7 +19,6 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 

-#define NETDISSECT_REWORKED

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/print-ascii.c b/print-ascii.c
index 3cefef33aeb4f8578138e81e49e857b623aa3a9f..71f16ff4c816fa763e31c037103ef460035fb3fa 100644 (file)
--- a/print-ascii.c
+++ b/print-ascii.c
@@ -36,7 +36,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
  * POSSIBILITY OF SUCH DAMAGE.
  */
 

-#define NETDISSECT_REWORKED

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/print-atalk.c b/print-atalk.c
index 61405493d0ea3685ab2ecf4afa3b85fb3a80aa97..0a235c82b3fc74926ceeb9796b33f2e0c9b11dc0 100644 (file)
--- a/print-atalk.c
+++ b/print-atalk.c
@@ -21,7 +21,6 @@
  * Format and print AppleTalk packets.
  */
 
  * Format and print AppleTalk packets.
  */
 

-#define NETDISSECT_REWORKED

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/print-atm.c b/print-atm.c
index 8faf715dac2dbb24d0bd4881dc9537fe8f9f70cc..64c2ff29ec0f8f53a324aca108282a5996399988 100644 (file)
--- a/print-atm.c
+++ b/print-atm.c
@@ -19,7 +19,6 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 

-#define NETDISSECT_REWORKED

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/print-babel.c b/print-babel.c
index 75cb32cf19e943b098ebbc01a96bd3027e446c78..bb2612c6df42d2b515061650d4606b85c7cff453 100644 (file)
--- a/print-babel.c
+++ b/print-babel.c
@@ -26,7 +26,6 @@
  * SUCH DAMAGE.
  */
 
  * SUCH DAMAGE.
  */
 

-#define NETDISSECT_REWORKED

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/print-beep.c b/print-beep.c
index 7982feb5c362333c1bb246fd0480a0f5517ddc23..4c5bc84a41f4dc1046925891c1e08a94f8f55d4b 100644 (file)
--- a/print-beep.c
+++ b/print-beep.c
@@ -9,7 +9,6 @@
  *
  */
 
  *
  */
 

-#define NETDISSECT_REWORKED

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/print-bfd.c b/print-bfd.c
index f1c2ee8cea8fc9c3418b5e39734a5e36293956a8..0450175f8b7a7a063f8142b2e317fccc9680433b 100644 (file)
--- a/print-bfd.c
+++ b/print-bfd.c
@@ -13,7 +13,6 @@
  * Original code by Hannes Gredler ([email protected])
  */
 
  * Original code by Hannes Gredler ([email protected])
  */
 

-#define NETDISSECT_REWORKED

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/print-bgp.c b/print-bgp.c
index c617c3bbbed39959bd78afa5f29be22dc94251f5..6a4fa2c0ff50e3f0c92befe8cb81516152a0c458 100644 (file)
--- a/print-bgp.c
+++ b/print-bgp.c
@@ -30,7 +30,6 @@
  * complete BGP support.
  */
 
  * complete BGP support.
  */
 

-#define NETDISSECT_REWORKED

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/print-bootp.c b/print-bootp.c
index fe0a070ca093a0fb26742fb5a8145f27f92620d4..07c518e8a09b00b22284e4c81df031a85fc73e0e 100644 (file)
--- a/print-bootp.c
+++ b/print-bootp.c
@@ -21,7 +21,6 @@
  * Format and print bootp packets.
  */
 
  * Format and print bootp packets.
  */
 

-#define NETDISSECT_REWORKED

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/print-bt.c b/print-bt.c
index 128daade063f8ade4c449803bbc5422c6a4d785a..68c02a61610eb0d3bedf8974c52d1db4b077c31e 100644 (file)
--- a/print-bt.c
+++ b/print-bt.c
@@ -17,7 +17,6 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 

-#define NETDISSECT_REWORKED

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/print-calm-fast.c b/print-calm-fast.c
index 5cc39f418531ec39e903f4483b5c4ea221ff2ceb..5d1cb64f6d96cf1ace35e88feba089b1f4fd9325 100644 (file)
--- a/print-calm-fast.c
+++ b/print-calm-fast.c
@@ -15,7 +15,6 @@
  * Original code by Ola Martin Lykkja ([email protected])
  */
 
  * Original code by Ola Martin Lykkja ([email protected])
  */
 

-#define NETDISSECT_REWORKED

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/print-carp.c b/print-carp.c
index 7b9f28ceae4fbbc2ef2836ba49ab29c789ee8a8d..6417c1a8e57883bc3949475c7ef867fd8b93ef6a 100644 (file)
--- a/print-carp.c
+++ b/print-carp.c
@@ -34,7 +34,6 @@
  *
  */
 
  *
  */
 

-#define NETDISSECT_REWORKED

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/print-cdp.c b/print-cdp.c
index 932f7bccea6803d84bc8e529aa1f9133a01a645f..c28bd8825b79bb3a15d54758108da6cd38eeab37 100644 (file)
--- 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
  */
 
  *    http://www.cisco.com/univercd/cc/td/doc/product/lan/trsrb/frames.htm
  */
 

-#define NETDISSECT_REWORKED

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/print-cfm.c b/print-cfm.c
index a85eec09139ea45b1d2df9abfc5dd7af9ee7a2a8..735fb1ee0a0e83429e332213a72147a50870b1e2 100644 (file)
--- a/print-cfm.c
+++ b/print-cfm.c
@@ -17,7 +17,6 @@
  * Original code by Hannes Gredler ([email protected])
  */
 
  * Original code by Hannes Gredler ([email protected])
  */
 

-#define NETDISSECT_REWORKED

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/print-chdlc.c b/print-chdlc.c
index 3951ef77cdff5ce7388f00b8ac8527c2eb8a58db..766ae3810c306148a1e10d8e7aeff08396fb9a09 100644 (file)
--- a/print-chdlc.c
+++ b/print-chdlc.c
@@ -19,7 +19,6 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 

-#define NETDISSECT_REWORKED

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/print-cip.c b/print-cip.c
index 91abe08d306ae6db93bdabca79688782926da6eb..fadb83be69f82724192c43ba50fcd983d4141e84 100644 (file)
--- a/print-cip.c
+++ b/print-cip.c
@@ -20,7 +20,6 @@
  *
  */
 
  *
  */
 

-#define NETDISSECT_REWORKED

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/print-cnfp.c b/print-cnfp.c
index d80d7fd27442c2742d1da7e4e75073bc0bc1ae35..ea8b318df36309076c68ffcc7cea6fc4745864e7 100644 (file)
--- 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
  */
 
  *    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
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/print-dccp.c b/print-dccp.c
index 45468b555473c70c487aadbd9c78483f73660d09..979f6d34261d71bf66fe3980b117601fdf79aa60 100644 (file)
--- a/print-dccp.c
+++ b/print-dccp.c
@@ -7,7 +7,6 @@
  * BSD-style license that accompanies tcpdump or the GNU GPL version 2
  */
 
  * BSD-style license that accompanies tcpdump or the GNU GPL version 2
  */
 

-#define NETDISSECT_REWORKED

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/print-decnet.c b/print-decnet.c
index 5414ec20b5cdf486287f090ae4185a71c3144a7a..f32b511e541e393605e1a3051a0ce5abd7baa46d 100644 (file)
--- a/print-decnet.c
+++ b/print-decnet.c
@@ -19,7 +19,6 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 

-#define NETDISSECT_REWORKED

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/print-dhcp6.c b/print-dhcp6.c
index 53b96ef954c98478878dfaa489032b5dc1489dfd..ff55917a0db656436567a1473b0da3b71ec39883 100644 (file)
--- a/print-dhcp6.c
+++ b/print-dhcp6.c
@@ -40,7 +40,6 @@
  *  RFC6334: Dual-Stack Lite option,
  */
 
  *  RFC6334: Dual-Stack Lite option,
  */
 

-#define NETDISSECT_REWORKED

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/print-domain.c b/print-domain.c
index 8805007acf3f43c998967db7b077cba049aab796..3fcd9016db1bc51cab6abb27527d819e3e0249ed 100644 (file)
--- a/print-domain.c
+++ b/print-domain.c
@@ -19,7 +19,6 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 

-#define NETDISSECT_REWORKED

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/print-dtp.c b/print-dtp.c
index 5d84a770eecaa78ca44424869b441711dadd8d36..5983b84363549abc8491d1a808e00cf8f7f739f5 100644 (file)
--- a/print-dtp.c
+++ b/print-dtp.c
@@ -17,7 +17,6 @@
  * Original code by Carles Kishimoto <[email protected]>
  */
 
  * Original code by Carles Kishimoto <[email protected]>
  */
 

-#define NETDISSECT_REWORKED

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/print-dvmrp.c b/print-dvmrp.c
index 96a0ee73f578dfd53a22df520b01a895516bacc4..8e0083260bd61771c9ff4871abc0485ebae6e8aa 100644 (file)
--- a/print-dvmrp.c
+++ b/print-dvmrp.c
@@ -19,7 +19,6 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 

-#define NETDISSECT_REWORKED

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/print-eap.c b/print-eap.c
index 0e2c2d38a1d8ba1c6ec83da437f8e4eaaf41945e..58b1159e3979973ad74c98276552d9d6356c7130 100644 (file)
--- a/print-eap.c
+++ b/print-eap.c
@@ -21,7 +21,6 @@
  *
  */
 
  *
  */
 

-#define NETDISSECT_REWORKED

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/print-egp.c b/print-egp.c
index 9c5c811e74e53bc399a555866e8a27298b52e055..8e4abc65abb09e696033413c10dda4e4c7fa7a93 100644 (file)
--- a/print-egp.c
+++ b/print-egp.c
@@ -18,7 +18,6 @@
  * Initial contribution from Jeff Honig ([email protected]).
  */
 
  * Initial contribution from Jeff Honig ([email protected]).
  */
 

-#define NETDISSECT_REWORKED

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/print-eigrp.c b/print-eigrp.c
index cab77ba509aaf3503b4bf57fbc4e0de7c5f0793d..5718d5114344f89c4aaaad0b13b1888a02d92012 100644 (file)
--- a/print-eigrp.c
+++ b/print-eigrp.c
@@ -14,7 +14,6 @@
  * FOR A PARTICULAR PURPOSE.
  */
 
  * FOR A PARTICULAR PURPOSE.
  */
 

-#define NETDISSECT_REWORKED

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/print-enc.c b/print-enc.c
index 7bd8631e5207b35fd09c05acefe82c5669ffddda..84dc01ba4e65854e9a952f977e5a06286d4e5211 100644 (file)
--- a/print-enc.c
+++ b/print-enc.c
@@ -21,7 +21,6 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 

-#define NETDISSECT_REWORKED

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/print-esp.c b/print-esp.c
index 8e267d45cdf9381d0eff7f70dbbaee8eaefeb0e0..d4101cef3d436da13035b6a250a8ac05d1338de1 100644 (file)
--- a/print-esp.c
+++ b/print-esp.c
@@ -21,7 +21,6 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 

-#define NETDISSECT_REWORKED

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/print-ether.c b/print-ether.c
index e57d993b965e846ffc5670d470d198a08ce8e604..e491515cf527ecde346126904f7da59647962464 100644 (file)
--- a/print-ether.c
+++ b/print-ether.c
@@ -19,7 +19,6 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 

-#define NETDISSECT_REWORKED

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/print-fddi.c b/print-fddi.c
index ad760c851f384663aebde1256c268c78ad9e64f5..04ab0f67072b5e052aa207330c15f879ac4ba9db 100644 (file)
--- a/print-fddi.c
+++ b/print-fddi.c
@@ -19,7 +19,6 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 

-#define NETDISSECT_REWORKED

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/print-forces.c b/print-forces.c
index 6c02b256d71d31b40b85e8d0b451c6d4979bbbfe..6626e31f98e2af361684cee4c94e908d6dad78c7 100644 (file)
--- a/print-forces.c
+++ b/print-forces.c
@@ -14,7 +14,6 @@
  *
  */
 
  *
  */
 

-#define NETDISSECT_REWORKED

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/print-fr.c b/print-fr.c
index 0832522ce3c1de014da07640e7dc9e634e0cd3b1..d7dfe6c7cc37ba384e96ea67a256bbec9df3ea86 100644 (file)
--- a/print-fr.c
+++ b/print-fr.c
@@ -19,7 +19,6 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 

-#define NETDISSECT_REWORKED

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/print-frag6.c b/print-frag6.c
index 1290952885587d9971339c03b93f2d80f9fd252f..53dafb4c81f27db1710b8c77cfa614bfa8542016 100644 (file)
--- a/print-frag6.c
+++ b/print-frag6.c
@@ -19,7 +19,6 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 

-#define NETDISSECT_REWORKED

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/print-geneve.c b/print-geneve.c
index 2187ab8e528f12f1a2d98bd089125c0acbc11be9..56b9f2b58db16d2c54d1b7ceb89b27c04e495f89 100644 (file)
--- a/print-geneve.c
+++ b/print-geneve.c
@@ -15,7 +15,6 @@
  * FOR A PARTICULAR PURPOSE.
  */
 
  * FOR A PARTICULAR PURPOSE.
  */
 

-#define NETDISSECT_REWORKED

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/print-geonet.c b/print-geonet.c
index edfb7f2d6c0e359d929b8fb3926e169cd9bb76f4..6daf8b1d7e500ae09885a2b11be9dbee0182b864 100644 (file)
--- a/print-geonet.c
+++ b/print-geonet.c
@@ -15,7 +15,6 @@
  * Original code by Ola Martin Lykkja ([email protected])
  */
 
  * Original code by Ola Martin Lykkja ([email protected])
  */
 

-#define NETDISSECT_REWORKED

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/print-gre.c b/print-gre.c
index 4d7705f80edca018fa25b76862d035582a8306ff..ec2095561a2867af29b86018bb71c6a44ba3a14c 100644 (file)
--- a/print-gre.c
+++ b/print-gre.c
@@ -36,7 +36,6 @@
  * RFC1701 (GRE), RFC1702 (GRE IPv4), and RFC2637 (Enhanced GRE)
  */
 
  * RFC1701 (GRE), RFC1702 (GRE IPv4), and RFC2637 (Enhanced GRE)
  */
 

-#define NETDISSECT_REWORKED

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/print-hsrp.c b/print-hsrp.c
index 0e2420f712762934c61fc9cb26823199cef380a9..35272b941115874ceb2179cc3214937df3ca4a21 100644 (file)
--- a/print-hsrp.c
+++ b/print-hsrp.c
@@ -29,7 +29,6 @@
 
 /* Cisco Hot Standby Router Protocol (HSRP). */
 
 
 /* Cisco Hot Standby Router Protocol (HSRP). */
 

-#define NETDISSECT_REWORKED

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/print-icmp.c b/print-icmp.c
index 59eb007707e0eba1f35eaba9733142e820c70400..e70398767dc7ee9daf093221842b6a0b5b106bab 100644 (file)
--- a/print-icmp.c
+++ b/print-icmp.c
@@ -19,7 +19,6 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 

-#define NETDISSECT_REWORKED

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/print-icmp6.c b/print-icmp6.c
index 81563e6c81389308823b0de6a916cf973ca5ea8e..f6907a4c24abbc9d78e959fc6980c186a70bc07e 100644 (file)
--- a/print-icmp6.c
+++ b/print-icmp6.c
@@ -19,7 +19,6 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 

-#define NETDISSECT_REWORKED

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/print-igmp.c b/print-igmp.c
index e4808a77861a2cd04416003e38d8080084df28c8..d3a685aa9b970191d9b889d9c746d7e49e052aec 100644 (file)
--- a/print-igmp.c
+++ b/print-igmp.c
@@ -19,7 +19,6 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 

-#define NETDISSECT_REWORKED

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/print-igrp.c b/print-igrp.c
index fbb313427c72026ce5795ec508fe9618e33c48a7..7f4f1302c3d6875183bf14f90aa5d80044f309ca 100644 (file)
--- a/print-igrp.c
+++ b/print-igrp.c
@@ -21,7 +21,6 @@
  * Initial contribution from Francis Dupont ([email protected])
  */
 
  * Initial contribution from Francis Dupont ([email protected])
  */
 

-#define NETDISSECT_REWORKED

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/print-ip.c b/print-ip.c
index ceea5363f28b3b00b5a8923b5f498028cad034cb..dddb5965ec2ad19936df52d83bb12e9c54e533bc 100644 (file)
--- a/print-ip.c
+++ b/print-ip.c
@@ -19,7 +19,6 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 

-#define NETDISSECT_REWORKED

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/print-ip6.c b/print-ip6.c
index dd6b7f5105adb6037059988ca943547d566d14bf..fa4619261360666346c29de5b22c1d60af55f0a7 100644 (file)
--- a/print-ip6.c
+++ b/print-ip6.c
@@ -19,7 +19,6 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 

-#define NETDISSECT_REWORKED

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/print-ip6opts.c b/print-ip6opts.c
index 14ad42c3c99a6502fd26ddb2467d16d1306db30f..355c37a584b619dae9be1045c73a0577ab37202e 100644 (file)
--- a/print-ip6opts.c
+++ b/print-ip6opts.c
@@ -27,7 +27,6 @@
  * SUCH DAMAGE.
  */
 
  * SUCH DAMAGE.
  */
 

-#define NETDISSECT_REWORKED

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/print-ipcomp.c b/print-ipcomp.c
index 1ba687e843e0524baf48a4c5ae3a7c6d8c083b90..2504bfd9ae93511900f15130fe68f64e5c7930ce 100644 (file)
--- a/print-ipcomp.c
+++ b/print-ipcomp.c
@@ -19,7 +19,6 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 

-#define NETDISSECT_REWORKED

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/print-ipfc.c b/print-ipfc.c
index 295ac0fdab3d4e568171bc533babf9e792a743f6..6c92f901f1d81c68b410e4305db5f0310eaf1083 100644 (file)
--- a/print-ipfc.c
+++ b/print-ipfc.c
@@ -19,7 +19,6 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 

-#define NETDISSECT_REWORKED

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/print-ipnet.c b/print-ipnet.c
index c4ff16aba2f6daf29dbb38113fbe28e83a7c179f..6abc5c8008b474364cb5b826138424b8740ca6ac 100644 (file)
--- a/print-ipnet.c
+++ b/print-ipnet.c
@@ -1,4 +1,3 @@
-#define NETDISSECT_REWORKED

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/print-ipx.c b/print-ipx.c
index 93f5d595586217befdc30b77b6040befb38bbc45..12ec7dcf454c1383313feb8757ad47e58ed50f54 100644 (file)
--- a/print-ipx.c
+++ b/print-ipx.c
@@ -22,7 +22,6 @@
  * Contributed by Brad Parker ([email protected]).
  */
 
  * Contributed by Brad Parker ([email protected]).
  */
 

-#define NETDISSECT_REWORKED

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/print-isakmp.c b/print-isakmp.c
index bef0b45ef7f955543a0cf32dbe62973b1c823787..5267ad2499b0e56049424a7829becb6326b4f316 100644 (file)
--- a/print-isakmp.c
+++ b/print-isakmp.c
@@ -28,7 +28,6 @@
  *
  */
 
  *
  */
 

-#define NETDISSECT_REWORKED

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/print-isoclns.c b/print-isoclns.c
index 6f113feea4dcb1ed3cedd1afa7670f78baf41a7b..03a7cce1dae630d9f827ec71af5a3c45fb1cd08e 100644 (file)
--- a/print-isoclns.c
+++ b/print-isoclns.c
@@ -24,7 +24,6 @@
  * complete IS-IS & CLNP support.
  */
 
  * complete IS-IS & CLNP support.
  */
 

-#define NETDISSECT_REWORKED

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/print-juniper.c b/print-juniper.c
index e4bb77c9d7a35e44fee76132e02fe74c26804b21..750f76abe8268445a6c29d32380ee36792eb9dc1 100644 (file)
--- 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
 
 __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
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/print-krb.c b/print-krb.c
index 2eebfa69bb83d0c254871ee7186187d0dccf11b2..3b4798c6eeea7722176bdd8ae03c66c93a8748cc 100644 (file)
--- a/print-krb.c
+++ b/print-krb.c
@@ -21,7 +21,6 @@
  * Initial contribution from John Hawkinson ([email protected]).
  */
 
  * Initial contribution from John Hawkinson ([email protected]).
  */
 

-#define NETDISSECT_REWORKED

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/print-l2tp.c b/print-l2tp.c
index 346dae9d52c661b12ae181697affd5e6fd02ebae..4ebc35ee16e953a901b920e7ac5f196ab8ed2b6b 100644 (file)
--- a/print-l2tp.c
+++ b/print-l2tp.c
@@ -21,7 +21,6 @@
  * L2TP support contributed by Motonori Shindo ([email protected])
  */
 
  * L2TP support contributed by Motonori Shindo ([email protected])
  */
 

-#define NETDISSECT_REWORKED

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/print-lane.c b/print-lane.c
index c1e0b2e8e11f36cc9b0b502e8f41ce9d9ac3ed83..1f10fab14046a3f634f6dfc50b88c9601630fb6e 100644 (file)
--- a/print-lane.c
+++ b/print-lane.c
@@ -20,7 +20,6 @@
  *
  */
 
  *
  */
 

-#define NETDISSECT_REWORKED

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/print-ldp.c b/print-ldp.c
index 3f741d136ce45d510ef9d1e9d2b3cff9d4d2ddd7..cf421c436972fad433739a5181617e25e04dfa49 100644 (file)
--- a/print-ldp.c
+++ b/print-ldp.c
@@ -14,7 +14,6 @@
  *  and Steinar Haug ([email protected])
  */
 
  *  and Steinar Haug ([email protected])
  */
 

-#define NETDISSECT_REWORKED

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/print-llc.c b/print-llc.c
index e8a3314c5c79b9c305c06736fefc72b4a88b383e..fc83802893c5faf8a0aa5f362d0bf5ac153ea632 100644 (file)
--- a/print-llc.c
+++ b/print-llc.c
@@ -22,7 +22,6 @@
  *     with an awful lot of hacking by Jeffrey Mogul, DECWRL
  */
 
  *     with an awful lot of hacking by Jeffrey Mogul, DECWRL
  */
 

-#define NETDISSECT_REWORKED

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/print-lldp.c b/print-lldp.c
index ce3c09382a651fa9711f8e45dd04c0e5311bd3a0..e4bed732edc3d63882b872755899dc66eb855efc 100644 (file)
--- a/print-lldp.c
+++ b/print-lldp.c
@@ -19,7 +19,6 @@
  * DCBX extensions by Kaladhar Musunuru <[email protected]>
  */
 
  * DCBX extensions by Kaladhar Musunuru <[email protected]>
  */
 

-#define NETDISSECT_REWORKED

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/print-lmp.c b/print-lmp.c
index 904dd712986e3d2e7bc7eaaa527091bffc0cc904..ca1d5cd05d9a4c5230b705f067d322bdb086a7e0 100644 (file)
--- a/print-lmp.c
+++ b/print-lmp.c
@@ -17,7 +17,6 @@
  * by Manu Pathak ([email protected]), May 2005
  */
 
  * by Manu Pathak ([email protected]), May 2005
  */
 

-#define NETDISSECT_REWORKED

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/print-loopback.c b/print-loopback.c
index 9a74ae611397c537fe32ab5c4968e51ce51747a5..481cf6eef801f68aba4b94075833c3cbf167ca0e 100644 (file)
--- a/print-loopback.c
+++ b/print-loopback.c
@@ -30,7 +30,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
  * POSSIBILITY OF SUCH DAMAGE.
  */
 

-#define NETDISSECT_REWORKED

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/print-lspping.c b/print-lspping.c
index 888adfafbcdc8bf17c517359de44eff242d15519..ae43fef32034d22b215388857981f11626346153 100644 (file)
--- a/print-lspping.c
+++ b/print-lspping.c
@@ -13,7 +13,6 @@
  * Original code by Hannes Gredler ([email protected])
  */
 
  * Original code by Hannes Gredler ([email protected])
  */
 

-#define NETDISSECT_REWORKED

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/print-lwapp.c b/print-lwapp.c
index 5b8683f76905d266b695a0baee430c6b020aa1eb..a6c05a3977b9b6a4a55123b2d718f7868b21db01 100644 (file)
--- a/print-lwapp.c
+++ b/print-lwapp.c
@@ -17,7 +17,6 @@
  * Original code by Carles Kishimoto <[email protected]>
  */
 
  * Original code by Carles Kishimoto <[email protected]>
  */
 

-#define NETDISSECT_REWORKED

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/print-lwres.c b/print-lwres.c
index d78c9a9068597db5c9143012f12e4228f22b0dd7..c7f04685ec3a7b83eeee64a93c5c08eb2f003c0a 100644 (file)
--- a/print-lwres.c
+++ b/print-lwres.c
@@ -27,7 +27,6 @@
  * SUCH DAMAGE.
  */
 
  * SUCH DAMAGE.
  */
 

-#define NETDISSECT_REWORKED

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/print-m3ua.c b/print-m3ua.c
index 33f8777977f856424ee2267e626864d66af24b94..be7a30a4615bc28015f2e409118bf6f0a77d9f89 100644 (file)
--- a/print-m3ua.c
+++ b/print-m3ua.c
@@ -22,7 +22,6 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 

-#define NETDISSECT_REWORKED

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/print-mobile.c b/print-mobile.c
index df412eeb289799e6f8801b0692c612c1382ff83d..b61d0f5dcdd9df73f0dd4544497523e386e6b856 100644 (file)
--- a/print-mobile.c
+++ b/print-mobile.c
@@ -36,7 +36,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
  * POSSIBILITY OF SUCH DAMAGE.
  */
 

-#define NETDISSECT_REWORKED

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/print-mobility.c b/print-mobility.c
index 10af90b9dbf3a6da7ff817dc85b2c8a754c69e2a..787d04092a1a165a761fb487bf5c0fb1e16f5cdb 100644 (file)
--- a/print-mobility.c
+++ b/print-mobility.c
@@ -27,7 +27,6 @@
  * SUCH DAMAGE.
  */
 
  * SUCH DAMAGE.
  */
 

-#define NETDISSECT_REWORKED

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/print-mpcp.c b/print-mpcp.c
index 9da3582d540919237f2a64e866db54c9629de600..e2b6c394f2d9ef2696dbe143c8dc41f58d6865f5 100644 (file)
--- a/print-mpcp.c
+++ b/print-mpcp.c
@@ -17,7 +17,6 @@
  * Original code by Hannes Gredler ([email protected])
  */
 
  * Original code by Hannes Gredler ([email protected])
  */
 

-#define NETDISSECT_REWORKED

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/print-mpls.c b/print-mpls.c
index bc34d50623d3e0e6c066585174981ccd81287f30..03ff1b3ee4b5ecc660e0b076f89add533317db31 100644 (file)
--- a/print-mpls.c
+++ b/print-mpls.c
@@ -26,7 +26,6 @@
  * SUCH DAMAGE.
  */
 
  * SUCH DAMAGE.
  */
 

-#define NETDISSECT_REWORKED

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/print-mptcp.c b/print-mptcp.c
index f85f1d24a886c3e2361b0bbdc20856625e68ac98..947ffc4ffa4d8c397e323fabf6367a9465508fc5 100644 (file)
--- a/print-mptcp.c
+++ b/print-mptcp.c
@@ -32,7 +32,6 @@
  * SUCH DAMAGE.
  */
 
  * SUCH DAMAGE.
  */
 

-#define NETDISSECT_REWORKED

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/print-msdp.c b/print-msdp.c
index fb802b58fd4dff387fd65434ade35a24eabd021d..16abc3ecb71f3005209e0571824c5a709c0bbc13 100644 (file)
--- a/print-msdp.c
+++ b/print-msdp.c
@@ -16,7 +16,6 @@
  * FOR A PARTICULAR PURPOSE.
  */
 
  * FOR A PARTICULAR PURPOSE.
  */
 

-#define NETDISSECT_REWORKED

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/print-msnlb.c b/print-msnlb.c
index fcd0006482687850fae573e303beb9604209256a..840892107a72af5fd3aac9c4fb19eeb8b4d28374 100644 (file)
--- a/print-msnlb.c
+++ b/print-msnlb.c
@@ -26,7 +26,6 @@
  * SUCH DAMAGE.
  */
 
  * SUCH DAMAGE.
  */
 

-#define NETDISSECT_REWORKED

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/print-nflog.c b/print-nflog.c
index 95da4cba4f2dba97b6797e06fd5953ffdb4cb7ae..a29b930cb30f25ea4c01a57cc34efb9c1208a484 100644 (file)
--- a/print-nflog.c
+++ b/print-nflog.c
@@ -25,7 +25,6 @@
  * DAMAGE.
  */
 
  * DAMAGE.
  */
 

-#define NETDISSECT_REWORKED

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/print-nfs.c b/print-nfs.c
index dd2f7f12fd2b8033b3e62c29a729a880aff67ac2..e5f081a492b20b8151a8343d8adcb9d3cd8bfaf2 100644 (file)
--- a/print-nfs.c
+++ b/print-nfs.c
@@ -19,7 +19,6 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 

-#define NETDISSECT_REWORKED

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/print-ntp.c b/print-ntp.c
index e83d47a7dd58db4b0d478a47398f1d8f22865d27..c3ea82b6abe794aa1adccf88b779ca52258487c7 100644 (file)
--- a/print-ntp.c
+++ b/print-ntp.c
@@ -23,7 +23,6 @@
  *     loosely based on print-bootp.c
  */
 
  *     loosely based on print-bootp.c
  */
 

-#define NETDISSECT_REWORKED

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/print-null.c b/print-null.c
index 166f777dee2b24b660950fbd201b7ef171308c4f..8801e7b7ab330c970e5c7c852798380612767026 100644 (file)
--- a/print-null.c
+++ b/print-null.c
@@ -19,7 +19,6 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 

-#define NETDISSECT_REWORKED

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/print-olsr.c b/print-olsr.c
index b90eea1aa3047a3569a0affdb99b80d802e07439..737273135268ce3c385e66600f0147da640d0d1d 100644 (file)
--- a/print-olsr.c
+++ b/print-olsr.c
@@ -19,7 +19,6 @@
  * IPv6 additions by Florian Forster <octo at verplant.org>
  */
 
  * IPv6 additions by Florian Forster <octo at verplant.org>
  */
 

-#define NETDISSECT_REWORKED

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/print-openflow-1.0.c b/print-openflow-1.0.c
index a36c32f3b29a3457351461b2632ae881be6ba1d6..9fb0f635cc7bbdefd9619c861b882d32a3069430 100644 (file)
--- a/print-openflow-1.0.c
+++ b/print-openflow-1.0.c
@@ -56,7 +56,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
  * POSSIBILITY OF SUCH DAMAGE.
  */
 

-#define NETDISSECT_REWORKED

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/print-openflow.c b/print-openflow.c
index 8825ae3d5c8714a72fc559536f00d59ebf0bf55c..0563edead79b3ea76bfa3aaccec615b26839c75b 100644 (file)
--- a/print-openflow.c
+++ b/print-openflow.c
@@ -30,7 +30,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
  * POSSIBILITY OF SUCH DAMAGE.
  */
 

-#define NETDISSECT_REWORKED

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/print-ospf.c b/print-ospf.c
index 3583417ad54c39b468479034acf947323278516e..3e0d03c564de963042cfd32214fe89ae44a6d4a3 100644 (file)
--- a/print-ospf.c
+++ b/print-ospf.c
@@ -21,7 +21,6 @@
  * OSPF support contributed by Jeffrey Honig ([email protected])
  */
 
  * OSPF support contributed by Jeffrey Honig ([email protected])
  */
 

-#define NETDISSECT_REWORKED

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/print-ospf6.c b/print-ospf6.c
index 49210bc04dc5ace87248d458ea68ee225ecf809f..0d25baaca83d8b33d2ac62af5d256e9c12d8fc2c 100644 (file)
--- a/print-ospf6.c
+++ b/print-ospf6.c
@@ -21,7 +21,6 @@
  * OSPF support contributed by Jeffrey Honig ([email protected])
  */
 
  * OSPF support contributed by Jeffrey Honig ([email protected])
  */
 

-#define NETDISSECT_REWORKED

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/print-otv.c b/print-otv.c
index 53a79dea5db1a5e1f10306952a9ba5125fcdc0c6..3255ddb07e65eaaf1193460ada9bb5995e503dda 100644 (file)
--- a/print-otv.c
+++ b/print-otv.c
@@ -13,7 +13,6 @@
  * Original code by Francesco Fondelli (francesco dot fondelli, gmail dot com)
  */
 
  * Original code by Francesco Fondelli (francesco dot fondelli, gmail dot com)
  */
 

-#define NETDISSECT_REWORKED

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/print-pflog.c b/print-pflog.c
index 72ae276320ce9a18ee669ff582cfb69e972616c5..0df10c84163ad478cab557cbdd7f56d383c96004 100644 (file)
--- a/print-pflog.c
+++ b/print-pflog.c
@@ -19,7 +19,6 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 

-#define NETDISSECT_REWORKED

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/print-pgm.c b/print-pgm.c
index 6a8342539f477707d8d4dc05deb62d1c8c29b22f..58aa34695da88dac8bd41e0f73b62659253b47f2 100644 (file)
--- a/print-pgm.c
+++ b/print-pgm.c
@@ -13,7 +13,6 @@
  * Original code by Andy Heffernan ([email protected])
  */
 
  * Original code by Andy Heffernan ([email protected])
  */
 

-#define NETDISSECT_REWORKED

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/print-pim.c b/print-pim.c
index 15f4c51300e880b8fc447b5a5bf0cb9f1ff0ecaf..a8bcdcf81fa6c5f1bed9a03aba7f079cca4b4f3a 100644 (file)
--- a/print-pim.c
+++ b/print-pim.c
@@ -19,7 +19,6 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 

-#define NETDISSECT_REWORKED

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/print-pktap.c b/print-pktap.c
index e376cc6e6ab96c7336bdc2dc448fbcb1509ae140..2651cf8b5224fb3dd186d6ed51f98019ee07a147 100644 (file)
--- a/print-pktap.c
+++ b/print-pktap.c
@@ -19,7 +19,6 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 

-#define NETDISSECT_REWORKED

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/print-ppi.c b/print-ppi.c
index 06678b0f65aaa86acafd0e1c5a807cef98a0b0b0..9fa052086cb11a0120706d0f33dd1f5e643e7d3f 100644 (file)
--- a/print-ppi.c
+++ b/print-ppi.c
@@ -1,7 +1,7 @@
 /*
  * Oracle
  */
 /*
  * Oracle
  */

-#define NETDISSECT_REWORKED
+

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/print-ppp.c b/print-ppp.c
index edc03c021c4e27a43eccad12b6475f6f7e62c9b8..d9bca84c511082cedacd78b702373af2c4b596cf 100644 (file)
--- a/print-ppp.c
+++ b/print-ppp.c
@@ -29,7 +29,6 @@
  * o BAP support
  */
 
  * o BAP support
  */
 

-#define NETDISSECT_REWORKED

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/print-pppoe.c b/print-pppoe.c
index 1624c5e50f3b26fbe03191141d9faec5a289e521..8a2870a9517dfd23fb258271551dcf9e4c031725 100644 (file)
--- a/print-pppoe.c
+++ b/print-pppoe.c
@@ -21,7 +21,6 @@
  * Original code by Greg Stark <[email protected]>
  */
 
  * Original code by Greg Stark <[email protected]>
  */
 

-#define NETDISSECT_REWORKED

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/print-pptp.c b/print-pptp.c
index c77868d46256e0f9bf3327f4a4fbb918e1f6c026..1691dc6a17154975f9feb6a6cde8a70dc0ce0eb6 100644 (file)
--- a/print-pptp.c
+++ b/print-pptp.c
@@ -21,7 +21,6 @@
  * PPTP support contributed by Motonori Shindo ([email protected])
  */
 
  * PPTP support contributed by Motonori Shindo ([email protected])
  */
 

-#define NETDISSECT_REWORKED

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/print-radius.c b/print-radius.c
index 5cf8ad2b6f805aa5939873c4ad3be7b5eeb4600e..c66c79381edfe602dab649e4a4e9831c06d66eb0 100644 (file)
--- a/print-radius.c
+++ b/print-radius.c
@@ -48,7 +48,6 @@
  * TODO: Among other things to print ok MacIntosh and Vendor values
  */
 
  * TODO: Among other things to print ok MacIntosh and Vendor values
  */
 

-#define NETDISSECT_REWORKED

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/print-raw.c b/print-raw.c
index d20387c644c9149502615c601b763b42c61b9772..74d63639958937045b30717ba09d4d161122e9d5 100644 (file)
--- a/print-raw.c
+++ b/print-raw.c
@@ -19,7 +19,6 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 

-#define NETDISSECT_REWORKED

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/print-rip.c b/print-rip.c
index c1b036e442f36667afba8db6cd00f0d0658aea92..e76c56f6e00562c2d7a2f1114ed315d15d84eade 100644 (file)
--- a/print-rip.c
+++ b/print-rip.c
@@ -19,7 +19,6 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 

-#define NETDISSECT_REWORKED

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/print-ripng.c b/print-ripng.c
index 4bc900d105ac6a8a58c6a5eb383d94ebd9ee2135..a0318d15b07ff4a04d082640b3337d29d0405672 100644 (file)
--- a/print-ripng.c
+++ b/print-ripng.c
@@ -19,7 +19,6 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 

-#define NETDISSECT_REWORKED

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/print-rpki-rtr.c b/print-rpki-rtr.c
index 3dc15d90778b8d2e729f158224cfd7b8f7b2a4d4..e2eaf94cced40574e562dbc2172c818f83683cdb 100644 (file)
--- a/print-rpki-rtr.c
+++ b/print-rpki-rtr.c
@@ -17,7 +17,6 @@
  * Original code by Hannes Gredler ([email protected])
  */
 
  * Original code by Hannes Gredler ([email protected])
  */
 

-#define NETDISSECT_REWORKED

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/print-rrcp.c b/print-rrcp.c
index 2370d9c20e254aeeffec3850123a0d9a73e3b714..cb1779557723b759bf2c37c857bb2819b3dff359 100644 (file)
--- a/print-rrcp.c
+++ b/print-rrcp.c
@@ -21,7 +21,6 @@
  * and Realtek Echo Protocol (RRCP-REP) packets.
  */
 
  * and Realtek Echo Protocol (RRCP-REP) packets.
  */
 

-#define NETDISSECT_REWORKED

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/print-rsvp.c b/print-rsvp.c
index 263ef3d4656ac1f3d5d036ed36f930c36822ef68..2c510f30cda03574dce2740a5fe60f83948d7e7e 100644 (file)
--- a/print-rsvp.c
+++ b/print-rsvp.c
@@ -15,7 +15,6 @@
  * Original code by Hannes Gredler ([email protected])
  */
 
  * Original code by Hannes Gredler ([email protected])
  */
 

-#define NETDISSECT_REWORKED

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/print-rt6.c b/print-rt6.c
index 3d5f9e3721a10d6c627309a53293dd9f14506cdb..baa6945e4daf0ed8d63f583ba81bb3aaca3fa228 100644 (file)
--- a/print-rt6.c
+++ b/print-rt6.c
@@ -19,7 +19,6 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 

-#define NETDISSECT_REWORKED

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/print-rx.c b/print-rx.c
index 8a9babbc1f0f6efcd93158e1f22aaedaa2219b13..d2935a461eae57992ef1b9dd75a8f573905a9ea3 100644 (file)
--- a/print-rx.c
+++ b/print-rx.c
@@ -32,7 +32,6 @@
  * Ken Hornstein <[email protected]>
  */
 
  * Ken Hornstein <[email protected]>
  */
 

-#define NETDISSECT_REWORKED

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/print-sctp.c b/print-sctp.c
index 4b595f2e825e268473e769b96cc9e373b28f39ed..d48202f50326b5cfa22ece83eefbcb127a0a032c 100644 (file)
--- a/print-sctp.c
+++ b/print-sctp.c
@@ -33,7 +33,6 @@
  * SUCH DAMAGE.
  */
 
  * SUCH DAMAGE.
  */
 

-#define NETDISSECT_REWORKED

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/print-sflow.c b/print-sflow.c
index 24112f44ad1b1e37816212cd31984c5e0401f444..708f76052a115ab8bc7a88c062bf3f802b9a2ad5 100644 (file)
--- a/print-sflow.c
+++ b/print-sflow.c
@@ -19,7 +19,6 @@
  * Expansion and refactoring by Rick Jones <[email protected]>
  */
 
  * Expansion and refactoring by Rick Jones <[email protected]>
  */
 

-#define NETDISSECT_REWORKED

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/print-sip.c b/print-sip.c
index d0fd349f25e7e0acffcbe310cd55d9bf69d5b8c6..5c5d1fec7d3c2ffc827cd5dc3b715bff9d0aa098 100644 (file)
--- a/print-sip.c
+++ b/print-sip.c
@@ -15,7 +15,6 @@
  * Guy Harris.
  */
 
  * Guy Harris.
  */
 

-#define NETDISSECT_REWORKED

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/print-sl.c b/print-sl.c
index bd410ce21a28ff49e0128c4022645cae73e5fa07..cdf9945594446ad560c4a9588d4dc37b56e00ed9 100644 (file)
--- a/print-sl.c
+++ b/print-sl.c
@@ -19,7 +19,6 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 

-#define NETDISSECT_REWORKED

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/print-sll.c b/print-sll.c
index 1f5f60084a20441ce34f6add5e65c2e915aa2b89..76b4e95f2ffa50a25b3f44cbb96a4ef0bf3247f8 100644 (file)
--- a/print-sll.c
+++ b/print-sll.c
@@ -19,7 +19,6 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 

-#define NETDISSECT_REWORKED

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/print-slow.c b/print-slow.c
index 2db3581e2bf76953bd32a95d0f610596c8545e0c..968534e5c9b06e52e581e1b3badfd067d06df536 100644 (file)
--- a/print-slow.c
+++ b/print-slow.c
@@ -18,7 +18,6 @@
  * Original code by Hannes Gredler ([email protected])
  */
 
  * Original code by Hannes Gredler ([email protected])
  */
 

-#define NETDISSECT_REWORKED

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/print-smb.c b/print-smb.c
index f5be9ffc4428f7279a3a7e3b29ba60c9a0b0ebd3..b8c5d9d539dce92eeb93f44b51e0a3613124a441 100644 (file)
--- a/print-smb.c
+++ b/print-smb.c
@@ -6,7 +6,6 @@
  * or later
  */
 
  * or later
  */
 

-#define NETDISSECT_REWORKED

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/print-snmp.c b/print-snmp.c
index f5501582ba7a3b8aec3455ec7f55a4857ab013fd..04654f4593d55b2b902f7ae18be36ecbde6d9b0f 100644 (file)
--- a/print-snmp.c
+++ b/print-snmp.c
@@ -56,7 +56,6 @@
  #     @(#)snmp.awk.x  1.1 (LANL) 1/15/90
  */
 
  #     @(#)snmp.awk.x  1.1 (LANL) 1/15/90
  */
 

-#define NETDISSECT_REWORKED

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/print-stp.c b/print-stp.c
index 93bb600028585558bf2ae53f3d8ecd7aea4f5a16..a89932d6580f9fd3e9652396eb80d490419763e7 100644 (file)
--- a/print-stp.c
+++ b/print-stp.c
@@ -9,7 +9,6 @@
  * Contributed by Lennert Buytenhek <[email protected]>
  */
 
  * Contributed by Lennert Buytenhek <[email protected]>
  */
 

-#define NETDISSECT_REWORKED

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/print-sunatm.c b/print-sunatm.c
index fc03d42a47027c9f47b4fe6f5e35991fbee06818..d22e83a43d9dd8bb82fd3e7067f6651106461610 100644 (file)
--- a/print-sunatm.c
+++ b/print-sunatm.c
@@ -30,7 +30,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
  * POSSIBILITY OF SUCH DAMAGE.
  */
 

-#define NETDISSECT_REWORKED

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/print-sunrpc.c b/print-sunrpc.c
index bc7138de5d53c3acfbdeeac275b5dc8ff4af7f8b..1bca04e49ec0507c196a8235b3a24039e270a456 100644 (file)
--- a/print-sunrpc.c
+++ b/print-sunrpc.c
@@ -19,7 +19,6 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 

-#define NETDISSECT_REWORKED

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/print-symantec.c b/print-symantec.c
index dcff2a66bf05d1aba6521bb4c2f62d837e3703d6..665dbcc290318a5b7d7e0d5a16127efcbf498489 100644 (file)
--- a/print-symantec.c
+++ b/print-symantec.c
@@ -19,7 +19,6 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 

-#define NETDISSECT_REWORKED

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/print-syslog.c b/print-syslog.c
index 5e3cd4f70fe07ddab8f24eb746521b3416d40c1b..2d48181502a600730d3da714b8626aef82bfd1c5 100644 (file)
--- a/print-syslog.c
+++ b/print-syslog.c
@@ -14,7 +14,6 @@
  * FOR A PARTICULAR PURPOSE.
  */
 
  * FOR A PARTICULAR PURPOSE.
  */
 

-#define NETDISSECT_REWORKED

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/print-tcp.c b/print-tcp.c
index bc200e2f8e21a5d243985e2a5ed3eae0b93f7aec..466fc48e9755b79cd44a0195463cfcfd2c0a2c8c 100644 (file)
--- 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
 
 __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
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/print-telnet.c b/print-telnet.c
index fa59b1fe9531ed794ea411db4129cf1fe34934dd..b3f17ed28791f0ca7d937f4c289bdc5294efad03 100644 (file)
--- a/print-telnet.c
+++ b/print-telnet.c
@@ -45,7 +45,6 @@
  *      are preserved in all copies.
  */
 
  *      are preserved in all copies.
  */
 

-#define NETDISSECT_REWORKED

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/print-tftp.c b/print-tftp.c
index 9b88e74f1022767590a3c52fefd9f59fc843c0f6..acb8ca9d6947f25d5de0cbfec35eb1eadd0789f3 100644 (file)
--- a/print-tftp.c
+++ b/print-tftp.c
@@ -21,7 +21,6 @@
  * Format and print trivial file transfer protocol packets.
  */
 
  * Format and print trivial file transfer protocol packets.
  */
 

-#define NETDISSECT_REWORKED

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/print-timed.c b/print-timed.c
index 5830bc7be07781c3e83fc603395a8e6df64d850e..1d8c5804fffd61dc5799b0c542b452116045234b 100644 (file)
--- a/print-timed.c
+++ b/print-timed.c
@@ -19,7 +19,6 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 

-#define NETDISSECT_REWORKED

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/print-tipc.c b/print-tipc.c
index b883fba9fed663440ba2469d1047766197c8d0f4..f75d9f23a6c39f001e24804e571747a17b618574 100644 (file)
--- a/print-tipc.c
+++ b/print-tipc.c
@@ -19,7 +19,6 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 

-#define NETDISSECT_REWORKED

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/print-token.c b/print-token.c
index b88bcf7925207540c90547ae18c4f8c6a8cfe813..33647a14c069cc4c149c4f45bdb714ea285cfaec 100644 (file)
--- a/print-token.c
+++ b/print-token.c
@@ -24,7 +24,6 @@
  *     Guy Harris <[email protected]>
  */
 
  *     Guy Harris <[email protected]>
  */
 

-#define NETDISSECT_REWORKED

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/print-udld.c b/print-udld.c
index 15e2bf6fae492f864fae592fe021f2e8a4c6001e..fd6fdf9177fe3f80b60e3e2f1a20736559675833 100644 (file)
--- a/print-udld.c
+++ b/print-udld.c
@@ -18,7 +18,6 @@
  * Original code by Carles Kishimoto <[email protected]>
  */
 
  * Original code by Carles Kishimoto <[email protected]>
  */
 

-#define NETDISSECT_REWORKED

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/print-udp.c b/print-udp.c
index c3edf6ef5de19b855731cd0c30bf07ab6a2d0275..17816121a6c987261ab137db90e8689440729238 100644 (file)
--- a/print-udp.c
+++ b/print-udp.c
@@ -19,7 +19,6 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 

-#define NETDISSECT_REWORKED

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/print-usb.c b/print-usb.c
index 75f78fc9025a825a4fc3064b768a00ddd4868b4b..d0ad6141c06bafbff6d1bf29ec8edb24b671fb64 100644 (file)
--- a/print-usb.c
+++ b/print-usb.c
@@ -19,7 +19,6 @@
  *
  */
 
  *
  */
 

-#define NETDISSECT_REWORKED

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/print-vjc.c b/print-vjc.c
index 24f8a122c09b92a2b4cf82f5fae8f75037d3bc95..fc7aafa946c1aef2737384a26ce825c1e59307d7 100644 (file)
--- a/print-vjc.c
+++ b/print-vjc.c
@@ -19,7 +19,6 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 

-#define NETDISSECT_REWORKED

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/print-vqp.c b/print-vqp.c
index ce3572ac520898bb5fc5d281ae7f5b32a3334194..45150b6d56a213a203a55a036fdd908ae3eac893 100644 (file)
--- a/print-vqp.c
+++ b/print-vqp.c
@@ -17,7 +17,6 @@
  * Original code by Carles Kishimoto <[email protected]>
  */
 
  * Original code by Carles Kishimoto <[email protected]>
  */
 

-#define NETDISSECT_REWORKED

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/print-vrrp.c b/print-vrrp.c
index f739d1ed71659cfebc69f3f63a02a8da0e682890..30f89d3419d6a044ff5f30c620f4c4e972415682 100644 (file)
--- a/print-vrrp.c
+++ b/print-vrrp.c
@@ -23,7 +23,6 @@
  * FOR A PARTICULAR PURPOSE.
  */
 
  * FOR A PARTICULAR PURPOSE.
  */
 

-#define NETDISSECT_REWORKED

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/print-vtp.c b/print-vtp.c
index 9fe86e3c4bb67cea2775ed3a421d717f776dfe49..b771c643cde914e3117d79f486a70ecb51107441 100644 (file)
--- a/print-vtp.c
+++ b/print-vtp.c
@@ -22,7 +22,6 @@
  * Original code ode by Carles Kishimoto <[email protected]>
  */
 
  * Original code ode by Carles Kishimoto <[email protected]>
  */
 

-#define NETDISSECT_REWORKED

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/print-vxlan.c b/print-vxlan.c
index c4de68d5fb4f52793bc25d6b0d1b3599493ab182..c123b4cee4ba41577787bd4516ca61338cab9228 100644 (file)
--- a/print-vxlan.c
+++ b/print-vxlan.c
@@ -13,7 +13,6 @@
  * Original code by Francesco Fondelli (francesco dot fondelli, gmail dot com)
  */
 
  * Original code by Francesco Fondelli (francesco dot fondelli, gmail dot com)
  */
 

-#define NETDISSECT_REWORKED

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/print-wb.c b/print-wb.c
index 38c2a6727c6cbff449658f8e93d1d76fa349692a..3e3b06452eda646886d5fac13cba8f8fe7da580c 100644 (file)
--- a/print-wb.c
+++ b/print-wb.c
@@ -19,7 +19,6 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 

-#define NETDISSECT_REWORKED

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/print-zephyr.c b/print-zephyr.c
index 8132c49af7a1d928d9b4d5f5319c5b790012bc6c..c004f144860c8859326645420cbb232d4ebd9446 100644 (file)
--- a/print-zephyr.c
+++ b/print-zephyr.c
@@ -20,7 +20,6 @@
  * PURPOSE.
  */
 
  * PURPOSE.
  */
 

-#define NETDISSECT_REWORKED

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/print-zeromq.c b/print-zeromq.c
index ba22c96e72ad00a182437a93f176991a47ef15b1..b73020359c98c47dc25a63cba150c3425003e121 100644 (file)
--- a/print-zeromq.c
+++ b/print-zeromq.c
@@ -28,7 +28,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
  * POSSIBILITY OF SUCH DAMAGE.
  */
 

-#define NETDISSECT_REWORKED

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/signature.c b/signature.c
index 324035fb8b3c9ee63d392b1828099a4fa8d98723..84a3a64d59177f7dcc8775b16419d88779c326c0 100644 (file)
--- a/signature.c
+++ b/signature.c
@@ -15,7 +15,6 @@
  * Original code by Hannes Gredler ([email protected])
  */
 
  * Original code by Hannes Gredler ([email protected])
  */
 

-#define NETDISSECT_REWORKED

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/smbutil.c b/smbutil.c
index 1c1742c26dd32383478b358167cc1914458a1d5c..06354fb4180aa8ebe160e596a5f20ec4bdda3f62 100644 (file)
--- a/smbutil.c
+++ b/smbutil.c
@@ -6,7 +6,6 @@
  * or later
  */
 
  * or later
  */
 

-#define NETDISSECT_REWORKED

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/tcpdump.c b/tcpdump.c
index e8962b038a2b0a289bd7efba8e7d68f5a7a3b829..7e8091489320f73bad05bc6b81222d7cd17d5443 100644 (file)
--- a/tcpdump.c
+++ b/tcpdump.c
@@ -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,
        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);
        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. */
             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 */
           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");
           }
 
                   error("MakeTimedFilename: localtime");
           }
 


@@ -1001,7 +1001,7 @@ main(int argc, char **argv)
        if(wsockinit() != 0) return 1;
 #endif /* WIN32 */
 
        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;
         gndo->ndo_Oflag=1;
        gndo->ndo_Rflag=1;
        gndo->ndo_dlt=-1;


@@ -1048,17 +1048,17 @@ main(int argc, char **argv)
                        break;
 
                case 'A':
                        break;
 
                case 'A':

-                       ++Aflag;
+                       ++gndo->ndo_Aflag;

                        break;
 
                case 'b':
                        break;
 
                case 'b':

-                       ++bflag;
+                       ++gndo->ndo_bflag;

                        break;
 
 #if defined(HAVE_PCAP_CREATE) || defined(WIN32)
                case 'B':
                        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) */
                                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':
                        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;
 
                                error("invalid file size %s", optarg);
                        break;
 


@@ -1088,7 +1088,7 @@ main(int argc, char **argv)
                        break;
 
                case 'e':
                        break;
 
                case 'e':

-                       ++eflag;
+                       ++gndo->ndo_eflag;

                        break;
 
                case 'E':
                        break;
 
                case 'E':


@@ -1099,7 +1099,7 @@ main(int argc, char **argv)
                        break;
 
                case 'f':
                        break;
 
                case 'f':

-                       ++fflag;
+                       ++gndo->ndo_fflag;

                        break;
 
                case 'F':
                        break;
 
                case 'F':


@@ -1107,15 +1107,15 @@ main(int argc, char **argv)
                        break;
 
                case 'G':
                        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. */
                                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. */
 
                        /* 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));
                        }
                                error("main: can't get current time: %s",
                                    pcap_strerror(errno));
                        }


@@ -1127,7 +1127,7 @@ main(int argc, char **argv)
                        break;
 
                case 'H':
                        break;
 
                case 'H':

-                       ++Hflag;
+                       ++gndo->ndo_Hflag;

                        break;
 
                case 'i':
                        break;
 
                case 'i':


@@ -1174,14 +1174,14 @@ main(int argc, char **argv)
 
 #ifdef HAVE_PCAP_CREATE
                case 'I':
 
 #ifdef HAVE_PCAP_CREATE
                case 'I':

-                       ++Iflag;
+                       ++gndo->ndo_Iflag;

                        break;
 #endif /* HAVE_PCAP_CREATE */
 
 #ifdef HAVE_PCAP_SET_TSTAMP_TYPE
                case 'j':
                        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;
 
                                error("invalid time stamp type %s", optarg);
                        break;
 


@@ -1212,7 +1212,7 @@ main(int argc, char **argv)
                        break;
 
                case 'K':
                        break;
 
                case 'K':

-                       ++Kflag;
+                       ++gndo->ndo_Kflag;

                        break;
 
                case 'm':
                        break;
 
                case 'm':


@@ -1233,28 +1233,28 @@ main(int argc, char **argv)
 #ifndef HAVE_LIBCRYPTO
                        warning("crypto code not compiled in");
 #endif
 #ifndef HAVE_LIBCRYPTO
                        warning("crypto code not compiled in");
 #endif

-                       sigsecret = optarg;
+                       gndo->ndo_sigsecret = optarg;

                        break;
 
                case 'n':
                        break;
 
                case 'n':

-                       ++nflag;
+                       ++gndo->ndo_nflag;

                        break;
 
                case 'N':
                        break;
 
                case 'N':

-                       ++Nflag;
+                       ++gndo->ndo_Nflag;

                        break;
 
                case 'O':
                        break;
 
                case 'O':

-                       Oflag = 0;
+                       gndo->ndo_Oflag = 0;

                        break;
 
                case 'p':
                        break;
 
                case 'p':

-                       ++pflag;
+                       ++gndo->ndo_pflag;

                        break;
 
                case 'q':
                        break;
 
                case 'q':

-                       ++qflag;
-                       ++suppress_default_print;
+                       ++gndo->ndo_qflag;
+                       ++gndo->ndo_suppress_default_print;

                        break;
 
 #ifdef HAVE_PCAP_SETDIRECTION
                        break;
 
 #ifdef HAVE_PCAP_SETDIRECTION


@@ -1275,75 +1275,75 @@ main(int argc, char **argv)
                        break;
 
                case 'R':
                        break;
 
                case 'R':

-                       Rflag = 0;
+                       gndo->ndo_Rflag = 0;

                        break;
 
                case 's':
                        break;
 
                case 's':

-                       snaplen = strtol(optarg, &end, 0);
+                       gndo->ndo_snaplen = strtol(optarg, &end, 0);

                        if (optarg == end || *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);
                                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':
                        break;
 
                case 'S':

-                       ++Sflag;
+                       ++gndo->ndo_Sflag;

                        break;
 
                case 't':
                        break;
 
                case 't':

-                       ++tflag;
+                       ++gndo->ndo_tflag;

                        break;
 
                case 'T':
                        if (strcasecmp(optarg, "vat") == 0)
                        break;
 
                case 'T':
                        if (strcasecmp(optarg, "vat") == 0)

-                               packettype = PT_VAT;
+                               gndo->ndo_packettype = PT_VAT;

                        else if (strcasecmp(optarg, "wb") == 0)
                        else if (strcasecmp(optarg, "wb") == 0)

-                               packettype = PT_WB;
+                               gndo->ndo_packettype = PT_WB;

                        else if (strcasecmp(optarg, "rpc") == 0)
                        else if (strcasecmp(optarg, "rpc") == 0)

-                               packettype = PT_RPC;
+                               gndo->ndo_packettype = PT_RPC;

                        else if (strcasecmp(optarg, "rtp") == 0)
                        else if (strcasecmp(optarg, "rtp") == 0)

-                               packettype = PT_RTP;
+                               gndo->ndo_packettype = PT_RTP;

                        else if (strcasecmp(optarg, "rtcp") == 0)
                        else if (strcasecmp(optarg, "rtcp") == 0)

-                               packettype = PT_RTCP;
+                               gndo->ndo_packettype = PT_RTCP;

                        else if (strcasecmp(optarg, "snmp") == 0)
                        else if (strcasecmp(optarg, "snmp") == 0)

-                               packettype = PT_SNMP;
+                               gndo->ndo_packettype = PT_SNMP;

                        else if (strcasecmp(optarg, "cnfp") == 0)
                        else if (strcasecmp(optarg, "cnfp") == 0)

-                               packettype = PT_CNFP;
+                               gndo->ndo_packettype = PT_CNFP;

                        else if (strcasecmp(optarg, "tftp") == 0)
                        else if (strcasecmp(optarg, "tftp") == 0)

-                               packettype = PT_TFTP;
+                               gndo->ndo_packettype = PT_TFTP;

                        else if (strcasecmp(optarg, "aodv") == 0)
                        else if (strcasecmp(optarg, "aodv") == 0)

-                               packettype = PT_AODV;
+                               gndo->ndo_packettype = PT_AODV;

                        else if (strcasecmp(optarg, "carp") == 0)
                        else if (strcasecmp(optarg, "carp") == 0)

-                               packettype = PT_CARP;
+                               gndo->ndo_packettype = PT_CARP;

                        else if (strcasecmp(optarg, "radius") == 0)
                        else if (strcasecmp(optarg, "radius") == 0)

-                               packettype = PT_RADIUS;
+                               gndo->ndo_packettype = PT_RADIUS;

                        else if (strcasecmp(optarg, "zmtp1") == 0)
                        else if (strcasecmp(optarg, "zmtp1") == 0)

-                               packettype = PT_ZMTP1;
+                               gndo->ndo_packettype = PT_ZMTP1;

                        else if (strcasecmp(optarg, "vxlan") == 0)
                        else if (strcasecmp(optarg, "vxlan") == 0)

-                               packettype = PT_VXLAN;
+                               gndo->ndo_packettype = PT_VXLAN;

                        else if (strcasecmp(optarg, "pgm") == 0)
                        else if (strcasecmp(optarg, "pgm") == 0)

-                               packettype = PT_PGM;
+                               gndo->ndo_packettype = PT_PGM;

                        else if (strcasecmp(optarg, "pgm_zmtp1") == 0)
                        else if (strcasecmp(optarg, "pgm_zmtp1") == 0)

-                               packettype = PT_PGM_ZMTP1;
+                               gndo->ndo_packettype = PT_PGM_ZMTP1;

                        else if (strcasecmp(optarg, "lmp") == 0)
                        else if (strcasecmp(optarg, "lmp") == 0)

-                               packettype = PT_LMP;
+                               gndo->ndo_packettype = PT_LMP;

                        else
                                error("unknown packet type `%s'", optarg);
                        break;
 
                case 'u':
                        else
                                error("unknown packet type `%s'", optarg);
                        break;
 
                case 'u':

-                       ++uflag;
+                       ++gndo->ndo_uflag;

                        break;
 
 #ifdef HAVE_PCAP_DUMP_FLUSH
                case 'U':
                        break;
 
 #ifdef HAVE_PCAP_DUMP_FLUSH
                case 'U':

-                       ++Uflag;
+                       ++gndo->ndo_Uflag;

                        break;
 #endif
 
                case 'v':
                        break;
 #endif
 
                case 'v':

-                       ++vflag;
+                       ++gndo->ndo_vflag;

                        break;
 
                case 'V':
                        break;
 
                case 'V':


@@ -1355,20 +1355,20 @@ main(int argc, char **argv)
                        break;
 
                case 'W':
                        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);
                                error("invalid number of output files %s", optarg);

-                       WflagChars = getWflagChars(Wflag);
+                       gndo->ndo_WflagChars = getWflagChars(gndo->ndo_Wflag);

                        break;
 
                case 'x':
                        break;
 
                case 'x':

-                       ++xflag;
-                       ++suppress_default_print;
+                       ++gndo->ndo_xflag;
+                       ++gndo->ndo_suppress_default_print;

                        break;
 
                case 'X':
                        break;
 
                case 'X':

-                       ++Xflag;
-                       ++suppress_default_print;
+                       ++gndo->ndo_Xflag;
+                       ++gndo->ndo_suppress_default_print;

                        break;
 
                case 'y':
                        break;
 
                case 'y':


@@ -1435,7 +1435,7 @@ main(int argc, char **argv)
                show_devices_and_exit();
 #endif
 
                show_devices_and_exit();
 #endif
 

-       switch (tflag) {
+       switch (gndo->ndo_tflag) {

 
        case 0: /* Default */
        case 4: /* Default + Date*/
 
        case 0: /* Default */
        case 4: /* Default + Date*/


@@ -1453,7 +1453,7 @@ main(int argc, char **argv)
                break;
        }
 
                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)
                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;
                        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));
                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 (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",
                        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 (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 (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));
                        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);
                        (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);
                         }
                         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]);
 
        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);
                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. */
                        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);
 
                else
                  MakeFilename(dumpinfo.CurrentFileName, WFileName, 0, 0);
 


@@ -1853,7 +1853,7 @@ main(int argc, char **argv)
                 */
                capng_update(
                        CAPNG_DROP,
                 */
                capng_update(
                        CAPNG_DROP,

-                       (Cflag || Gflag ? 0 : CAPNG_PERMITTED)
+                       (gndo->ndo_Cflag || gndo->ndo_Gflag ? 0 : CAPNG_PERMITTED)

                                | CAPNG_EFFECTIVE,
                        CAP_DAC_OVERRIDE
                        );
                                | CAPNG_EFFECTIVE,
                        CAP_DAC_OVERRIDE
                        );


@@ -1864,7 +1864,7 @@ main(int argc, char **argv)
 #ifdef HAVE_CAPSICUM
                set_dumper_capsicum_rights(p);
 #endif
 #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),
 #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
                        pcap_userdata = (u_char *)p;
                }
 #ifdef HAVE_PCAP_DUMP_FLUSH

-               if (Uflag)
+               if (gndo->ndo_Uflag)

                        pcap_dump_flush(p);
 #endif
        } else {
                        pcap_dump_flush(p);
 #endif
        } else {


@@ -1914,7 +1914,7 @@ main(int argc, char **argv)
                (void)setsignal(SIGNAL_REQ_INFO, requestinfo);
 #endif
 
                (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
                /*
                 * 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.
                 */
                 * 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);
                        (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",
                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,
                } 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);
        }
                }
                (void)fflush(stderr);
        }


@@ -2033,7 +2033,7 @@ main(int argc, char **argv)
                                        RFileName, dlt_name,
                                        pcap_datalink_val_to_description(new_dlt));
                                }
                                        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));
                                        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).
         */
         * 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;
 
                /* 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 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 */
 #ifdef HAVE_CAPSICUM
                        FILE *fp;
                        int fd;
 #endif
 
                        /* Update the Gflag_time */

-                       Gflag_time = t;
+                       gndo->ndo_Gflag_time = t;

                        /* Update Gflag_count */
                        /* Update Gflag_count */

-                       Gflag_count++;
+                       gndo->ndo_Gflag_count++;

                        /*
                         * Close the current file and open a new one.
                         */
                        /*
                         * 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).
                         */
                         * 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",
                                (void)fprintf(stderr, "Maximum file limit reached: %d\n",

-                                   Wflag);
+                                   gndo->ndo_Wflag);

                                exit(0);
                                /* NOTREACHED */
                        }
                                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.
                         */
                         * 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.
                         */
 
                        /*
                         * 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,
                                MakeFilename(dump_info->CurrentFileName, dump_info->WFileName, 0,

-                                   WflagChars);
+                                   gndo->ndo_WflagChars);

                        else
                                MakeFilename(dump_info->CurrentFileName, dump_info->WFileName, 0, 0);
 
                        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.
         */
         * 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");
                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;
 #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);
 
                        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");
                        }
                        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);
 #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
 
        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
 
                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
 
        pcap_dump(user, h, sp);
 #ifdef HAVE_PCAP_DUMP_FLUSH

-       if (Uflag)
+       if (gndo->ndo_Uflag)

                pcap_dump_flush((pcap_dumper_t *)user);
 #endif
 
                pcap_dump_flush((pcap_dumper_t *)user);
 #endif
 

diff --git a/util.c b/util.c
index 5569021c242ca7d9155f4bcdb68a19353cc6ea9b..03da7725330dc2824e34e15aa34c35a59e02a2ca 100644 (file)
--- a/util.c
+++ b/util.c
@@ -35,7 +35,6 @@
  * FOR A PARTICULAR PURPOSE.
  */
 
  * FOR A PARTICULAR PURPOSE.
  */
 

-#define NETDISSECT_REWORKED

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif