diff options
| author | Denis Ovsienko <infrastation@yandex.ru> | 2014-03-15 14:19:49 +0400 |
|---|---|---|
| committer | Denis Ovsienko <infrastation@yandex.ru> | 2014-03-15 14:19:49 +0400 |
| commit | 1fe6e66ecec3fb7a7cc729038012cbb264542331 (patch) | |
| tree | 994f5218d7609bedbd50f207d1b15e43f661be50 | |
| parent | 85a2dd977cad3e21b475abbedeb795989207b8db (diff) | |
| download | tcpdump-1fe6e66ecec3fb7a7cc729038012cbb264542331.tar.gz | |
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.
57 files changed, 99 insertions, 50 deletions
diff --git a/print-802_15_4.c b/print-802_15_4.c index cf5f637a..ee66832f 100644 --- 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; @@ -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 00289008..5400ab44 100644 --- 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 6a9e891a..41588a80 100644 --- 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 846cf780..08921bdb 100644 --- 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 84fc82ed..d9a6535a 100644 --- 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 1ddb9eb5..7982feb5 100644 --- 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 2cec16ef..b9d69cf4 100644 --- a/print-bfd.c +++ b/print-bfd.c @@ -13,13 +13,14 @@ * Original code by Hannes Gredler (hannes@juniper.net) */ +#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" @@ -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 3d58fe0d..351b6b8d 100644 --- a/print-calm-fast.c +++ b/print-calm-fast.c @@ -15,13 +15,14 @@ * Original code by Ola Martin Lykkja (ola.lykkja@q-free.com) */ +#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 832d7ae1..976e4f22 100644 --- 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 aab55a5e..c2bb24c6 100644 --- 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 8ac2f04e..3f972b48 100644 --- 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 f0f67152..07163e38 100644 --- 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 e502ad54..88f98a78 100644 --- a/print-dtp.c +++ b/print-dtp.c @@ -17,13 +17,14 @@ * Original code by Carles Kishimoto <carles.kishimoto@gmail.com> */ +#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 0d740089..2a47ad65 100644 --- 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 b8c49fd9..12909528 100644 --- 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 72edc246..6c77be23 100644 --- 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 0059284f..f8299bcd 100644 --- 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 cd0a7f9f..d6a9976f 100644 --- 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 8234a88d..794f0c52 100644 --- a/print-igrp.c +++ b/print-igrp.c @@ -21,13 +21,14 @@ * Initial contribution from Francis Dupont (francis.dupont@inria.fr) */ +#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 04584361..1d37e0d1 100644 --- 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 f0dd4503..e6493842 100644 --- 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 e5a38b6a..caa42327 100644 --- 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 d03b590e..61dbbee3 100644 --- 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 c697a30f..d777a952 100644 --- 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 215ef201..7404dd79 100644 --- a/print-ipx.c +++ b/print-ipx.c @@ -22,6 +22,7 @@ * Contributed by Brad Parker (brad@fcr.com). */ +#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/print-lane.c b/print-lane.c index dd8aff0b..97653efd 100644 --- 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 1708033a..c0297b8d 100644 --- 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 cebbea04..64c7d556 100644 --- 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 a61e0531..85423d1c 100644 --- a/print-mpcp.c +++ b/print-mpcp.c @@ -17,13 +17,14 @@ * Original code by Hannes Gredler (hannes@juniper.net) */ +#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 cd323ce2..21b7ba46 100644 --- 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 ce466da9..87812435 100644 --- 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 ec16a4db..c28646f9 100644 --- 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 5ef4b2fd..5985799e 100644 --- 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 16330b94..f1af5440 100644 --- 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 3b182f7e..6daec446 100644 --- 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 eb88784c..07f0732f 100644 --- 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 de6ec4af..720142df 100644 --- 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 109f3f48..eae5ac4e 100644 --- a/print-pppoe.c +++ b/print-pppoe.c @@ -21,6 +21,7 @@ * Original code by Greg Stark <gsstark@mit.edu> */ +#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/print-raw.c b/print-raw.c index 83f66b48..d20387c6 100644 --- 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 6bd47e67..17b0ef72 100644 --- 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 fa7adac5..62c4a880 100644 --- a/print-rpki-rtr.c +++ b/print-rpki-rtr.c @@ -17,6 +17,7 @@ * Original code by Hannes Gredler (hannes@juniper.net) */ +#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 cca00cfb..82d0788a 100644 --- 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 798598be..9cd13de1 100644 --- 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 878bb796..4144a4ba 100644 --- 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 2589dfd7..ae350852 100644 --- 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 fd19286e..631c7d96 100644 --- 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 58186405..1e3a373f 100644 --- 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 24e1603e..8dd23b33 100644 --- a/print-token.c +++ b/print-token.c @@ -24,6 +24,7 @@ * Guy Harris <guy@alum.mit.edu> */ +#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/print-udld.c b/print-udld.c index 7bc8acec..f846a884 100644 --- a/print-udld.c +++ b/print-udld.c @@ -18,13 +18,14 @@ * Original code by Carles Kishimoto <carles.kishimoto@gmail.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" #define UDLD_HEADER_LEN 4 diff --git a/print-usb.c b/print-usb.c index 7f453e33..75f78fc9 100644 --- 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 14f35dad..24f8a122 100644 --- 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 3245b332..bf25bf7a 100644 --- a/print-vqp.c +++ b/print-vqp.c @@ -17,13 +17,14 @@ * Original code by Carles Kishimoto <Carles.Kishimoto@bsc.es> */ +#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 6f60d92a..a86e9cfa 100644 --- 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 0142a4a8..8132c49a 100644 --- 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 98a9e928..1f31163a 100644 --- 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]"; |