make use of NETDISSECT_REWORKED

Update the already converted decoders to define the macro and to include
interface.h instead of netdissect.h. Fix incurred compile errors.

diff --git a/print-802_15_4.c b/print-802_15_4.c
index cf5f637a7b253dcc14e2dac9a3adc6d33ab01dd5..ee66832fcf8ec4b301dfbcc4aed74478b6cecff7 100644 (file)
--- a/print-802_15_4.c
+++ b/print-802_15_4.c
@@ -20,15 +20,13 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
+#define NETDISSECT_REWORKED
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
 #include <tcpdump-stdinc.h>
 
-#include <stdio.h>
-#include <string.h>
-
 #include "interface.h"
 #include "addrtoname.h"
 
@@ -111,7 +109,7 @@ ieee802_15_4_if_print(struct netdissect_options *ndo,
        caplen -= 3;
 
        ND_PRINT((ndo,"IEEE 802.15.4 %s packet ", ftypes[fc & 0x7]));
-       if (vflag)
+       if (ndo->ndo_vflag)
                ND_PRINT((ndo,"seq %02x ", seq));
        if (hdrlen == -1) {
                ND_PRINT((ndo,"malformed! "));
@@ -119,7 +117,7 @@ ieee802_15_4_if_print(struct netdissect_options *ndo,
        }
 
 
-       if (!vflag) {
+       if (!ndo->ndo_vflag) {
                p+= hdrlen;
                caplen -= hdrlen;
        } else {
@@ -175,7 +173,7 @@ ieee802_15_4_if_print(struct netdissect_options *ndo,
                caplen -= hdrlen;
        }
 
-       if (!suppress_default_print)
+       if (!ndo->ndo_suppress_default_print)
                (ndo->ndo_default_print)(ndo, p, caplen);
 
        return 0;

diff --git a/print-ah.c b/print-ah.c
index 360fc5e5421e42f0418df12b2db3cf60503d2488..dd4130e49943c7d66c03929f12641bed7bff3476 100644 (file)
--- a/print-ah.c
+++ b/print-ah.c
@@ -21,6 +21,7 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
+#define NETDISSECT_REWORKED
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -29,7 +30,7 @@
 
 #include "ah.h"
 
-#include "netdissect.h"
+#include "interface.h"
 #include "extract.h"
 
 int

diff --git a/print-ahcp.c b/print-ahcp.c
index 00289008b7332fbbe852542ec2a9f5e2590c9d63..5400ab440af46f7b6e57641549e087ac53b1dd84 100644 (file)
--- a/print-ahcp.c
+++ b/print-ahcp.c
@@ -29,13 +29,14 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+#define NETDISSECT_REWORKED
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
 #include <tcpdump-stdinc.h>
 
-#include "netdissect.h"
+#include "interface.h"
 #include "extract.h"
 #include "addrtoname.h"
 

diff --git a/print-ap1394.c b/print-ap1394.c
index 6a9e891a573bfeafdc74c43f5667200772f8741f..41588a80ed1026f66c766e6d9125d4b9d1ac20f3 100644 (file)
--- a/print-ap1394.c
+++ b/print-ap1394.c
@@ -19,13 +19,14 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
+#define NETDISSECT_REWORKED
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
 #include <tcpdump-stdinc.h>
 
-#include "netdissect.h"
+#include "interface.h"
 #include "extract.h"
 #include "addrtoname.h"
 #include "ethertype.h"

diff --git a/print-arcnet.c b/print-arcnet.c
index 846cf780008c2e5b4d16ea4c3afe2e8a34921dd0..08921bdb1ea81b4c5f74b6091249115c0d761d2d 100644 (file)
--- a/print-arcnet.c
+++ b/print-arcnet.c
@@ -21,6 +21,7 @@
  * From: NetBSD: print-arcnet.c,v 1.2 2000/04/24 13:02:28 itojun Exp
  */
 
+#define NETDISSECT_REWORKED
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/print-arp.c b/print-arp.c
index 84fc82edb5e86b0dd48955b11e9071edf6fb0d66..d9a6535af07618b8666898d16482799e01395a18 100644 (file)
--- a/print-arp.c
+++ b/print-arp.c
@@ -19,6 +19,7 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
+#define NETDISSECT_REWORKED
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -27,7 +28,7 @@
 
 #include <string.h>
 
-#include "netdissect.h"
+#include "interface.h"
 #include "addrtoname.h"
 #include "ether.h"
 #include "ethertype.h"

diff --git a/print-beep.c b/print-beep.c
index 1ddb9eb5f4a95411518f0a7a7a5183b80beb0653..7982feb5c362333c1bb246fd0480a0f5517ddc23 100644 (file)
--- a/print-beep.c
+++ b/print-beep.c
@@ -9,6 +9,7 @@
  *
  */
 
+#define NETDISSECT_REWORKED
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -17,7 +18,7 @@
 
 #include <string.h>
 
-#include "netdissect.h"
+#include "interface.h"
 
 /* Check for a string but not go beyond length
  * Return TRUE on match, FALSE otherwise

diff --git a/print-bfd.c b/print-bfd.c
index 2cec16ef93085b0000d19b214e1f84de901f43c3..b9d69cf42eac096d62408108f921df6332af2202 100644 (file)
--- a/print-bfd.c
+++ b/print-bfd.c
@@ -13,13 +13,14 @@
  * Original code by Hannes Gredler ([email protected])
  */
 
+#define NETDISSECT_REWORKED
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
 #include <tcpdump-stdinc.h>
 
-#include "netdissect.h"
+#include "interface.h"
 #include "extract.h"
 
 #include "udp.h"

diff --git a/print-bt.c b/print-bt.c
index 95741e605ad53479efe4237cd121441cbcc8a43d..7337047dcd5005709b85092b2482a2076fb60a42 100644 (file)
--- a/print-bt.c
+++ b/print-bt.c
@@ -17,6 +17,7 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
+#define NETDISSECT_REWORKED
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/print-calm-fast.c b/print-calm-fast.c
index 3d58fe0d7b3a8f227cbf8fdcc0780794f4c7be88..351b6b8dd2bd686e34d602da9a1b2abc92749440 100644 (file)
--- a/print-calm-fast.c
+++ b/print-calm-fast.c
@@ -15,13 +15,14 @@
  * Original code by Ola Martin Lykkja ([email protected])
  */
 
+#define NETDISSECT_REWORKED
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
 #include <tcpdump-stdinc.h>
 
-#include "netdissect.h"
+#include "interface.h"
 #include "addrtoname.h"
 
 /*

diff --git a/print-carp.c b/print-carp.c
index 832d7ae1cc588ad89b96575a926d1d2f4e8242a6..976e4f2294a484f8d6bb36b69acb91bfc42b5802 100644 (file)
--- a/print-carp.c
+++ b/print-carp.c
@@ -34,6 +34,7 @@
  *
  */
 
+#define NETDISSECT_REWORKED
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -41,7 +42,6 @@
 #include <tcpdump-stdinc.h>
 
 #include "interface.h" /* for checksum structure and functions */
-#include "netdissect.h"
 #include "extract.h"
 
 void

diff --git a/print-chdlc.c b/print-chdlc.c
index aab55a5e4de6be41bf4491845b151ff9a8558232..c2bb24c699dda290dd924ba213e8e88896b20c90 100644 (file)
--- a/print-chdlc.c
+++ b/print-chdlc.c
@@ -19,6 +19,7 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
+#define NETDISSECT_REWORKED
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/print-cip.c b/print-cip.c
index 8ac2f04ef40784cba8a222b2bcad16c45b3949d0..3f972b48b4390344a4bd180c67786272e1b5e4b1 100644 (file)
--- a/print-cip.c
+++ b/print-cip.c
@@ -20,6 +20,7 @@
  *
  */
 
+#define NETDISSECT_REWORKED
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/print-dccp.c b/print-dccp.c
index f0f67152a778c5df3a1f5368539de1c7ac7d532e..07163e3835dd612805e5f384ea180daecd0c254b 100644 (file)
--- a/print-dccp.c
+++ b/print-dccp.c
@@ -7,6 +7,7 @@
  * BSD-style license that accompanies tcpdump or the GNU GPL version 2
  */
 
+#define NETDISSECT_REWORKED
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/print-dtp.c b/print-dtp.c
index e502ad54ce1f394b6112124c0365dd751c1b5a76..88f98a78092bc467dca896b935d5a1492e3866fd 100644 (file)
--- a/print-dtp.c
+++ b/print-dtp.c
@@ -17,13 +17,14 @@
  * Original code by Carles Kishimoto <[email protected]>
  */
 
+#define NETDISSECT_REWORKED
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
 #include <tcpdump-stdinc.h>
 
-#include "netdissect.h"
+#include "interface.h"
 #include "addrtoname.h"
 #include "extract.h"
 

diff --git a/print-fddi.c b/print-fddi.c
index 0d740089c7c8db7586829150963e3016a41346cf..2a47ad65404aae7eacbc1ab939ec6bf20ee7ca92 100644 (file)
--- a/print-fddi.c
+++ b/print-fddi.c
@@ -19,6 +19,7 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
+#define NETDISSECT_REWORKED
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/print-frag6.c b/print-frag6.c
index b8c49fd986946b5866011f6d1856e546909d6db7..1290952885587d9971339c03b93f2d80f9fd252f 100644 (file)
--- a/print-frag6.c
+++ b/print-frag6.c
@@ -19,6 +19,7 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
+#define NETDISSECT_REWORKED
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -28,7 +29,7 @@
 #include <tcpdump-stdinc.h>
 
 #include "ip6.h"
-#include "netdissect.h"
+#include "interface.h"
 #include "extract.h"
 
 int

diff --git a/print-gre.c b/print-gre.c
index 72edc2466b6ef52a93d03ae5642b712d4aaeb72c..6c77be2370ee1bcd4f6154623c120e0708677c91 100644 (file)
--- a/print-gre.c
+++ b/print-gre.c
@@ -36,6 +36,7 @@
  * RFC1701 (GRE), RFC1702 (GRE IPv4), and RFC2637 (Enhanced GRE)
  */
 
+#define NETDISSECT_REWORKED
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/print-hsrp.c b/print-hsrp.c
index 0059284f467a9ee2cf53ca393423bad1b80ec385..f8299bcdfdabffb45307b706109a2633f1ef5163 100644 (file)
--- a/print-hsrp.c
+++ b/print-hsrp.c
@@ -29,6 +29,7 @@
 
 /* Cisco Hot Standby Router Protocol (HSRP). */
 
+#define NETDISSECT_REWORKED
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -113,7 +114,7 @@ hsrp_print(netdissect_options *ndo, register const u_int8_t *bp, register u_int
        }
        ND_TCHECK(hp->hsrp_virtaddr);
        ND_PRINT((ndo, "addr=%s", ipaddr_string(&hp->hsrp_virtaddr)));
-       if (vflag) {
+       if (ndo->ndo_vflag) {
                ND_PRINT((ndo, " hellotime="));
                relts_print(hp->hsrp_hellotime);
                ND_PRINT((ndo, " holdtime="));
@@ -121,7 +122,7 @@ hsrp_print(netdissect_options *ndo, register const u_int8_t *bp, register u_int
                ND_PRINT((ndo, " priority=%d", hp->hsrp_priority));
                ND_PRINT((ndo, " auth=\""));
                if (fn_printn(hp->hsrp_authdata, sizeof(hp->hsrp_authdata),
-                   snapend)) {
+                   ndo->ndo_snapend)) {
                        ND_PRINT((ndo, "\""));
                        goto trunc;
                }

diff --git a/print-icmp6.c b/print-icmp6.c
index cd0a7f9fa3ee5ac00c16cc51e8c71091ab3fb309..d6a9976f1c2cdc5999855c36d12c768bac4ed377 100644 (file)
--- a/print-icmp6.c
+++ b/print-icmp6.c
@@ -19,6 +19,7 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
+#define NETDISSECT_REWORKED
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -30,7 +31,6 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "netdissect.h"
 #include "interface.h"
 #include "addrtoname.h"
 #include "extract.h"

diff --git a/print-igrp.c b/print-igrp.c
index 8234a88d6656c11676c68bca1981403fa74d48b4..794f0c5267226a8e1efc3ca3113094afbb64ee13 100644 (file)
--- a/print-igrp.c
+++ b/print-igrp.c
@@ -21,13 +21,14 @@
  * Initial contribution from Francis Dupont ([email protected])
  */
 
+#define NETDISSECT_REWORKED
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
 #include <tcpdump-stdinc.h>
 
-#include "netdissect.h"
+#include "interface.h"
 #include "extract.h"                   /* must come after interface.h */
 
 /* Cisco IGRP definitions */

diff --git a/print-ip6.c b/print-ip6.c
index 0458436142fa40e727fb0091cf02b910ed0dc107..1d37e0d1b3f9930b5c01c7290db33e3287f71496 100644 (file)
--- a/print-ip6.c
+++ b/print-ip6.c
@@ -19,6 +19,7 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
+#define NETDISSECT_REWORKED
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -29,7 +30,6 @@
 
 #include <string.h>
 
-#include "netdissect.h"
 #include "interface.h"
 #include "addrtoname.h"
 #include "extract.h"
@@ -86,7 +86,7 @@ ip6_print(netdissect_options *ndo, const u_char *bp, u_int length)
 
        ip6 = (const struct ip6_hdr *)bp;
 
-       TCHECK(*ip6);
+       ND_TCHECK(*ip6);
        if (length < sizeof (struct ip6_hdr)) {
                (void)ND_PRINT((ndo, "truncated-ip6 %u", length));
                return;
@@ -203,7 +203,7 @@ ip6_print(netdissect_options *ndo, const u_char *bp, u_int length)
                        icmp6_print(ndo, cp, len, (const u_char *)ip6, fragmented);
                        return;
                case IPPROTO_AH:
-                       advance = ah_print(gndo, cp);
+                       advance = ah_print(ndo, cp);
                        nh = *cp;
                        break;
                case IPPROTO_ESP:

diff --git a/print-ip6opts.c b/print-ip6opts.c
index f0dd45036d44671ee3f48d516c8ada8c533f3630..e6493842b94774e0a9ad2be0340221bb3cfaa790 100644 (file)
--- a/print-ip6opts.c
+++ b/print-ip6opts.c
@@ -27,6 +27,7 @@
  * SUCH DAMAGE.
  */
 
+#define NETDISSECT_REWORKED
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -36,7 +37,7 @@
 
 #include "ip6.h"
 
-#include "netdissect.h"
+#include "interface.h"
 #include "addrtoname.h"
 #include "extract.h"
 

diff --git a/print-ipcomp.c b/print-ipcomp.c
index e5a38b6a52affce3c12189b668b8ce2be48baa0e..caa4232723dcf56849f9e55b367f674308ae91a2 100644 (file)
--- a/print-ipcomp.c
+++ b/print-ipcomp.c
@@ -19,6 +19,7 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
+#define NETDISSECT_REWORKED
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -35,7 +36,7 @@ struct ipcomp {
 #include <zlib.h>
 #endif
 
-#include "netdissect.h"
+#include "interface.h"
 #include "extract.h"
 
 int

diff --git a/print-ipfc.c b/print-ipfc.c
index d03b590ef07dc6bb4a2e8ac2bd1b57898b379dd6..61dbbee347323a99109a0fcc4d98d5d652f3862c 100644 (file)
--- a/print-ipfc.c
+++ b/print-ipfc.c
@@ -19,6 +19,7 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
+#define NETDISSECT_REWORKED
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/print-ipnet.c b/print-ipnet.c
index c697a30f15d1912c122e5899a3264a4b06d30272..d777a95268f002a9a6198d023b867bb719693afe 100644 (file)
--- a/print-ipnet.c
+++ b/print-ipnet.c
@@ -1,10 +1,10 @@
+#define NETDISSECT_REWORKED
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
 #include <tcpdump-stdinc.h>
 
-#include "netdissect.h"
 #include "interface.h"
 
 typedef struct ipnet_hdr {

diff --git a/print-ipx.c b/print-ipx.c
index 215ef20109f2168fc17db3f2465e2611ce307945..7404dd79c86f6bad5f370b32afac226e86d231c9 100644 (file)
--- a/print-ipx.c
+++ b/print-ipx.c
@@ -22,6 +22,7 @@
  * Contributed by Brad Parker ([email protected]).
  */
 
+#define NETDISSECT_REWORKED
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/print-lane.c b/print-lane.c
index dd8aff0be2c8b28ecc918f6294087224e5c2a81c..97653efd6d52078bd4c1bdb9898edfe005391dc9 100644 (file)
--- a/print-lane.c
+++ b/print-lane.c
@@ -20,13 +20,14 @@
  *
  */
 
+#define NETDISSECT_REWORKED
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
 #include <tcpdump-stdinc.h>
 
-#include "netdissect.h"
+#include "interface.h"
 #include "extract.h"
 #include "ether.h"
 

diff --git a/print-loopback.c b/print-loopback.c
index 1708033a211b1c53b3d4f7fd1dcb3619175e2859..c0297b8d6cc6da7a41dfe0602f2d55d03caccaf5 100644 (file)
--- a/print-loopback.c
+++ b/print-loopback.c
@@ -30,13 +30,14 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+#define NETDISSECT_REWORKED
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
 #include <tcpdump-stdinc.h>
 
-#include "netdissect.h"
+#include "interface.h"
 #include "extract.h"
 #include "ether.h"
 #include "addrtoname.h"

diff --git a/print-mobile.c b/print-mobile.c
index cebbea045cfd40ad391b780f6272f90ec071af56..64c7d5564c46fa9587c4df8013e2423a6dc1c149 100644 (file)
--- a/print-mobile.c
+++ b/print-mobile.c
@@ -36,6 +36,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+#define NETDISSECT_REWORKED
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/print-mpcp.c b/print-mpcp.c
index a61e0531164e019fbe2240ea8b8844b5c1e0018c..85423d1cf7541053a8c9b7d44f4b6eb047551e7b 100644 (file)
--- a/print-mpcp.c
+++ b/print-mpcp.c
@@ -17,13 +17,14 @@
  * Original code by Hannes Gredler ([email protected])
  */
 
+#define NETDISSECT_REWORKED
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
 #include <tcpdump-stdinc.h>
 
-#include "netdissect.h"
+#include "interface.h"
 #include "extract.h"
 
 #define MPCP_TIMESTAMP_LEN        4

diff --git a/print-mpls.c b/print-mpls.c
index cd323ce26c44667170ad02fcdaaf8a60bd0d78fc..21b7ba46b0657e10cbc7597a6ccc832c030e7189 100644 (file)
--- a/print-mpls.c
+++ b/print-mpls.c
@@ -26,6 +26,7 @@
  * SUCH DAMAGE.
  */
 
+#define NETDISSECT_REWORKED
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/print-msdp.c b/print-msdp.c
index ce466da9661dc2a90bd692a3ec016099cf4dbcd8..878124355cd4687e7817c74e63bb95382f88b60e 100644 (file)
--- a/print-msdp.c
+++ b/print-msdp.c
@@ -16,13 +16,14 @@
  * FOR A PARTICULAR PURPOSE.
  */
 
+#define NETDISSECT_REWORKED
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
 #include <tcpdump-stdinc.h>
 
-#include "netdissect.h"
+#include "interface.h"
 #include "addrtoname.h"
 #include "extract.h"
 

diff --git a/print-msnlb.c b/print-msnlb.c
index ec16a4dba9afbee502af9b7d5dc594a2e5394b9d..c28646f995f43b1dcb4f349e85cb18b8698e419d 100644 (file)
--- a/print-msnlb.c
+++ b/print-msnlb.c
@@ -26,13 +26,14 @@
  * SUCH DAMAGE.
  */
 
+#define NETDISSECT_REWORKED
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
 #include <tcpdump-stdinc.h>
 
-#include "netdissect.h"
+#include "interface.h"
 #include "addrtoname.h"
 #include "extract.h"
 

diff --git a/print-nflog.c b/print-nflog.c
index 5ef4b2fd059a78785b3cc84c9f4a326a5712f3af..5985799eca3cb60777e710501f98acfa4ad5a5d6 100644 (file)
--- a/print-nflog.c
+++ b/print-nflog.c
@@ -25,13 +25,14 @@
  * DAMAGE.
  */
 
+#define NETDISSECT_REWORKED
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
 #include <tcpdump-stdinc.h>
 
-#include "netdissect.h"
+#include "interface.h"
 
 #if defined(DLT_NFLOG) && defined(HAVE_PCAP_NFLOG_H)
 #include <pcap/nflog.h>

diff --git a/print-null.c b/print-null.c
index 16330b9431dd82e0f7b173b4cffbc2da3770b69c..f1af54401a4e32d197a4dc4b52a9686b2784456e 100644 (file)
--- a/print-null.c
+++ b/print-null.c
@@ -19,6 +19,7 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
+#define NETDISSECT_REWORKED
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/print-otv.c b/print-otv.c
index 3b182f7e46a3fcbcba3533888db0859ce8dd9214..6daec446d2ef81cdf26c1fd265d6aef9c3cbcdc0 100644 (file)
--- a/print-otv.c
+++ b/print-otv.c
@@ -13,13 +13,14 @@
  * Original code by Francesco Fondelli (francesco dot fondelli, gmail dot com)
  */
 
+#define NETDISSECT_REWORKED
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
 #include <tcpdump-stdinc.h>
 
-#include "netdissect.h"
+#include "interface.h"
 #include "extract.h"
 
 /*

diff --git a/print-pflog.c b/print-pflog.c
index eb88784c9359d7c895aba3e78cd12c7209440b6f..07f0732f7e592e9b629fa06d7762095fc609f2d1 100644 (file)
--- a/print-pflog.c
+++ b/print-pflog.c
@@ -19,6 +19,7 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
+#define NETDISSECT_REWORKED
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -34,7 +35,7 @@
 
 #include <tcpdump-stdinc.h>
 
-#include "netdissect.h"
+#include "interface.h"
 #include "extract.h"
 
 static const char tstr[] = "[|pflog]";

diff --git a/print-ppi.c b/print-ppi.c
index de6ec4af4b94d72e4d58f63086cbb0a479205b1e..720142dffd6406bab3c3f5521e9b9a7f990058b3 100644 (file)
--- a/print-ppi.c
+++ b/print-ppi.c
@@ -1,13 +1,13 @@
 /*
  * Oracle
  */
+#define NETDISSECT_REWORKED
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
 #include <tcpdump-stdinc.h>
 
-#include "netdissect.h"
 #include "interface.h"
 #include "extract.h"
 

diff --git a/print-pppoe.c b/print-pppoe.c
index 109f3f48fb44b466ac40ae0c3970e96c2363b7ef..eae5ac4e7f19dd2d0305573e0b6a9ee70cdd25de 100644 (file)
--- a/print-pppoe.c
+++ b/print-pppoe.c
@@ -21,6 +21,7 @@
  * Original code by Greg Stark <[email protected]>
  */
 
+#define NETDISSECT_REWORKED
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/print-raw.c b/print-raw.c
index 83f66b488efa66bbc87a0858b09dab076ff4ccd4..d20387c644c9149502615c601b763b42c61b9772 100644 (file)
--- a/print-raw.c
+++ b/print-raw.c
@@ -19,13 +19,14 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
+#define NETDISSECT_REWORKED
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
 #include <tcpdump-stdinc.h>
 
-#include "netdissect.h"
+#include "interface.h"
 
 /*
  * The DLT_RAW packet has no header. It contains a raw IP packet.

diff --git a/print-ripng.c b/print-ripng.c
index 6bd47e67a3d13559cb79e1a96d8c885c7470a45f..17b0ef72e55a0756afff273ddf821fef484cddf9 100644 (file)
--- a/print-ripng.c
+++ b/print-ripng.c
@@ -19,6 +19,7 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
+#define NETDISSECT_REWORKED
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -27,7 +28,7 @@
 
 #include <tcpdump-stdinc.h>
 
-#include "netdissect.h"
+#include "interface.h"
 #include "addrtoname.h"
 #include "extract.h"
 

diff --git a/print-rpki-rtr.c b/print-rpki-rtr.c
index fa7adac5c4c3c34827da5f4a7d26d3c77664bc79..62c4a8806f6e3dc74e80c218736e3a33a0670b29 100644 (file)
--- a/print-rpki-rtr.c
+++ b/print-rpki-rtr.c
@@ -17,6 +17,7 @@
  * Original code by Hannes Gredler ([email protected])
  */
 
+#define NETDISSECT_REWORKED
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -25,7 +26,7 @@
 
 #include <string.h>
 
-#include "netdissect.h"
+#include "interface.h"
 #include "extract.h"
 #include "addrtoname.h"
 

diff --git a/print-rrcp.c b/print-rrcp.c
index cca00cfb76433406a084775b49a766f3155ff37e..82d0788a3b90d4c6b67ac75e5bcda4ec3ed81339 100644 (file)
--- a/print-rrcp.c
+++ b/print-rrcp.c
@@ -21,13 +21,14 @@
  * and Realtek Echo Protocol (RRCP-REP) packets.
  */
 
+#define NETDISSECT_REWORKED
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
 #include <tcpdump-stdinc.h>
 
-#include "netdissect.h"
+#include "interface.h"
 #include "addrtoname.h"
 #include "extract.h"
 #include "ether.h"

diff --git a/print-rt6.c b/print-rt6.c
index 798598be89d3f0e95f19a759e3ffeb02de814453..9cd13de1ce7ad7eadb6762074c57fee5cbe4abab 100644 (file)
--- a/print-rt6.c
+++ b/print-rt6.c
@@ -19,6 +19,7 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
+#define NETDISSECT_REWORKED
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -29,7 +30,7 @@
 
 #include "ip6.h"
 
-#include "netdissect.h"
+#include "interface.h"
 #include "addrtoname.h"
 #include "extract.h"
 

diff --git a/print-sll.c b/print-sll.c
index 878bb79637aa9ff6117c7b795f17f6227b4d83cd..4144a4badcd31d8d6d9a8e61802e72450e79bf10 100644 (file)
--- a/print-sll.c
+++ b/print-sll.c
@@ -19,6 +19,7 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
+#define NETDISSECT_REWORKED
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/print-sunrpc.c b/print-sunrpc.c
index 2589dfd708a0a615ce4c40be6553a033a95e871a..ae3508528cced71d0bd9909e170ad1dbf4f2aadf 100644 (file)
--- a/print-sunrpc.c
+++ b/print-sunrpc.c
@@ -19,6 +19,7 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
+#define NETDISSECT_REWORKED
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -50,7 +51,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "netdissect.h"
+#include "interface.h"
 #include "addrtoname.h"
 #include "extract.h"
 

diff --git a/print-symantec.c b/print-symantec.c
index fd19286e6852a2f684bd7a15ddb616f067f8d262..631c7d961665d332886834023f61cfb2f0d2eb46 100644 (file)
--- a/print-symantec.c
+++ b/print-symantec.c
@@ -19,13 +19,14 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
+#define NETDISSECT_REWORKED
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
 #include <tcpdump-stdinc.h>
 
-#include "netdissect.h"
+#include "interface.h"
 #include "extract.h"
 #include "ethertype.h"
 

diff --git a/print-tipc.c b/print-tipc.c
index 58186405c3eb8ca4777a85dde6a7188c4f1acc8b..1e3a373fecc640de60a219c5b64efe8591cea159 100644 (file)
--- a/print-tipc.c
+++ b/print-tipc.c
@@ -19,13 +19,14 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
+#define NETDISSECT_REWORKED
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
 #include <tcpdump-stdinc.h>
 
-#include "netdissect.h"
+#include "interface.h"
 #include "ether.h"
 #include "ethertype.h"
 #include "extract.h"                   /* must come after interface.h */

diff --git a/print-token.c b/print-token.c
index 24e1603e92da2bd1e78ea632e61101cea26ebedf..8dd23b3373eb8aa21315e490e2e473efeccfaa85 100644 (file)
--- a/print-token.c
+++ b/print-token.c
@@ -24,6 +24,7 @@
  *     Guy Harris <[email protected]>
  */
 
+#define NETDISSECT_REWORKED
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/print-udld.c b/print-udld.c
index 7bc8acece1f3ea5897778d4f684355e22659da89..f846a884472bef54c7b553717425f57bfa098e5d 100644 (file)
--- a/print-udld.c
+++ b/print-udld.c
@@ -18,13 +18,14 @@
  * Original code by Carles Kishimoto <[email protected]>
  */
 
+#define NETDISSECT_REWORKED
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
 #include <tcpdump-stdinc.h>
 
-#include "netdissect.h"
+#include "interface.h"
 #include "extract.h"
 
 #define UDLD_HEADER_LEN                        4

diff --git a/print-usb.c b/print-usb.c
index 7f453e33a28ac24be3782f87d019df63373beb46..75f78fc9025a825a4fc3064b768a00ddd4868b4b 100644 (file)
--- a/print-usb.c
+++ b/print-usb.c
@@ -19,13 +19,14 @@
  *
  */
 
+#define NETDISSECT_REWORKED
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
 #include <tcpdump-stdinc.h>
 
-#include "netdissect.h"
+#include "interface.h"
 
 
 #if defined(HAVE_PCAP_USB_H) && defined(DLT_USB_LINUX)

diff --git a/print-vjc.c b/print-vjc.c
index 14f35dad085b8d03e0cee69d82ae3725cecb384e..24f8a122c09b92a2b4cf82f5fae8f75037d3bc95 100644 (file)
--- a/print-vjc.c
+++ b/print-vjc.c
@@ -19,13 +19,14 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
+#define NETDISSECT_REWORKED
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
 #include <tcpdump-stdinc.h>
 
-#include "netdissect.h"
+#include "interface.h"
 #include "slcompress.h"
 #include "ppp.h"
 

diff --git a/print-vqp.c b/print-vqp.c
index 3245b33206d022824f3d7ebd57df2d3a02bea4b8..bf25bf7a0eb0ef1a214a8ac81ebe87ec8ef036ee 100644 (file)
--- a/print-vqp.c
+++ b/print-vqp.c
@@ -17,13 +17,14 @@
  * Original code by Carles Kishimoto <[email protected]>
  */
 
+#define NETDISSECT_REWORKED
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
 #include <tcpdump-stdinc.h>
 
-#include "netdissect.h"
+#include "interface.h"
 #include "extract.h"
 #include "addrtoname.h"
 

diff --git a/print-vxlan.c b/print-vxlan.c
index 6f60d92ae2a512d4c7cfd21a815d2fa751393a08..a86e9cfaa01225b60985c46f7f920db7673f63b8 100644 (file)
--- a/print-vxlan.c
+++ b/print-vxlan.c
@@ -13,13 +13,14 @@
  * Original code by Francesco Fondelli (francesco dot fondelli, gmail dot com)
  */
 
+#define NETDISSECT_REWORKED
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
 #include <tcpdump-stdinc.h>
 
-#include "netdissect.h"
+#include "interface.h"
 #include "extract.h"
 
 /*

diff --git a/print-zephyr.c b/print-zephyr.c
index 0142a4a8700ffcb6e96a0fd6050568b6fd90ac08..8132c49af7a1d928d9b4d5f5319c5b790012bc6c 100644 (file)
--- a/print-zephyr.c
+++ b/print-zephyr.c
@@ -20,6 +20,7 @@
  * PURPOSE.
  */
 
+#define NETDISSECT_REWORKED
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -30,7 +31,7 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include "netdissect.h"
+#include "interface.h"
 
 struct z_packet {
     char *version;

diff --git a/print-zeromq.c b/print-zeromq.c
index 98a9e928bf3cda68dc60039eb8138f5ef4f4fefc..1f31163a0a0616d5afda61b7690a5f7b146af6a9 100644 (file)
--- a/print-zeromq.c
+++ b/print-zeromq.c
@@ -28,13 +28,14 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+#define NETDISSECT_REWORKED
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
 #include <tcpdump-stdinc.h>
 
-#include "netdissect.h"
+#include "interface.h"
 #include "extract.h"
 
 static const char tstr[] = " [|zmtp1]";