summaryrefslogtreecommitdiff
path: root/print-token.c
diff options
context:
space:
mode:
authorguy <guy>2000-09-23 08:03:27 +0000
committerguy <guy>2000-09-23 08:03:27 +0000
commite89409254248af64db721ede4babbe9fd1753f6c (patch)
tree9fd711539537701b449c778b0f6fc9c57bf90e88 /print-token.c
parenta547c0ebd8facfee13f199add7917ca6d5d5233b (diff)
downloadtcpdump-e89409254248af64db721ede4babbe9fd1753f6c.tar.gz
Add definitions of Ethernet types from
"linux-includes/netinet/if_ether.h" to "ethertype.h". Move other stuff used by dissectors from <netinet/if_ether.h> to "ether.h", along the lines of "fddi.h" and "token.h". Move ARP declarations from BSD include files to "print-arp.c". Remove from dissectors includes of <netinet/if_ether.h>, and add includes of "ethertype.h" and/or "ether.h" as necessary. Get rid of configuration options that test declarations now made in "ether.h" or "print-arp.c", as those declarations are now under our control, not the OS's control.
Diffstat (limited to 'print-token.c')
-rw-r--r--print-token.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/print-token.c b/print-token.c
index 3168b6e4..917c225b 100644
--- a/print-token.c
+++ b/print-token.c
@@ -25,7 +25,7 @@
*/
#ifndef lint
static const char rcsid[] =
- "@(#) $Header: /tcpdump/master/tcpdump/print-token.c,v 1.2 2000-07-30 05:55:44 assar Exp $";
+ "@(#) $Header: /tcpdump/master/tcpdump/print-token.c,v 1.3 2000-09-23 08:03:41 guy Exp $";
#endif
#ifdef HAVE_CONFIG_H
@@ -41,7 +41,6 @@ struct rtentry;
#include <net/if.h>
#include <netinet/in.h>
-#include <netinet/if_ether.h>
#include <netinet/in_systm.h>
#include <netinet/ip.h>
@@ -52,6 +51,7 @@ struct rtentry;
#include "addrtoname.h"
#include "ethertype.h"
+#include "ether.h"
#include "token.h"
/* Extract src, dst addresses */