summaryrefslogtreecommitdiff
path: root/print-ip.c
diff options
context:
space:
mode:
authorguy <guy>2000-09-23 08:54:24 +0000
committerguy <guy>2000-09-23 08:54:24 +0000
commit536f5125835b031330f472aebed8241a1718b018 (patch)
treea334e9acc3b3104a347ebfebffead00d12f19c68 /print-ip.c
parent7b50febe28e54e076a9917164eeddec4bc7a170e (diff)
downloadtcpdump-536f5125835b031330f472aebed8241a1718b018.tar.gz
Add an "ip.h" header, to declare the IP stuff needed by dissectors, and
have dissectors include them rather than <netinet/ip.h> or <netinet/ip_var.h>, if they actually need that stuff. Put the declarations of the ICMP stuff directly into "print-icmp.c". Remove all unnecessary includes of <netinet/ip*.h> files. Copy the byte-order stuff from "nameser.h" into "tcp.h".
Diffstat (limited to 'print-ip.c')
-rw-r--r--print-ip.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/print-ip.c b/print-ip.c
index 6f770bd6..86686d22 100644
--- a/print-ip.c
+++ b/print-ip.c
@@ -21,7 +21,7 @@
#ifndef lint
static const char rcsid[] =
- "@(#) $Header: /tcpdump/master/tcpdump/print-ip.c,v 1.86 2000-09-23 08:26:34 guy Exp $ (LBL)";
+ "@(#) $Header: /tcpdump/master/tcpdump/print-ip.c,v 1.87 2000-09-23 08:54:31 guy Exp $ (LBL)";
#endif
#ifdef HAVE_CONFIG_H
@@ -34,8 +34,6 @@ static const char rcsid[] =
#include <netinet/in.h>
#include <netinet/in_systm.h>
-#include <netinet/ip.h>
-#include <netinet/ip_var.h>
#include <stdio.h>
#include <stdlib.h>
@@ -46,6 +44,8 @@ static const char rcsid[] =
#include "interface.h"
#include "extract.h" /* must come after interface.h */
+#include "ip.h"
+
/* Compatibility */
#ifndef IPPROTO_ND
#define IPPROTO_ND 77