michael@657: Index: configure.in
michael@657: --- configure.in.orig	2010-03-12 02:56:44.000000000 +0100
michael@657: +++ configure.in	2010-03-31 09:51:51.000000000 +0200
michael@657: @@ -739,10 +739,10 @@
michael@657:  
michael@657:  if test $ac_cv_func_pcap_lib_version = "no" ; then
michael@657:      AC_MSG_CHECKING(whether pcap_version is defined by libpcap)
michael@657: -    AC_TRY_LINK([],
michael@657: +    AC_TRY_LINK(
michael@657:         [
michael@657:  	extern char pcap_version[];
michael@657: -
michael@657: +       ],[
michael@657:  	return (int)pcap_version;
michael@657:         ],
michael@657:         ac_lbl_cv_pcap_version_defined=yes,
michael@657: @@ -755,10 +755,10 @@
michael@657:      fi
michael@657:  fi
michael@657:  AC_MSG_CHECKING(whether pcap_debug is defined by libpcap)
michael@657: -AC_TRY_LINK([],
michael@657: +AC_TRY_LINK(
michael@657:     [
michael@657:  	extern int pcap_debug;
michael@657: -
michael@657: +   ],[
michael@657:  	return pcap_debug;
michael@657:     ],
michael@657:     ac_lbl_cv_pcap_debug_defined=yes,
michael@657: @@ -772,10 +772,10 @@
michael@657:  	# OK, what about "yydebug"?
michael@657:  	#
michael@657:  	AC_MSG_CHECKING(whether yydebug is defined by libpcap)
michael@657: -	AC_TRY_LINK([],
michael@657: +	AC_TRY_LINK(
michael@657:  	   [
michael@657:  		extern int yydebug;
michael@657: -
michael@657: +	   ],[
michael@657:  		return yydebug;
michael@657:  	   ],
michael@657:  	   ac_lbl_cv_yydebug_defined=yes,
michael@657: Index: ether.h
michael@657: --- ether.h.orig	2010-03-12 02:56:44.000000000 +0100
michael@657: +++ ether.h	2010-03-31 09:51:51.000000000 +0200
michael@657: @@ -34,7 +34,9 @@
michael@657:   *	@(#)if_ether.h	8.3 (Berkeley) 5/2/95
michael@657:   */
michael@657:  
michael@657: +#ifndef ETHERMTU
michael@657:  #define	ETHERMTU	1500
michael@657: +#endif
michael@657:  
michael@657:  /*
michael@657:   * The number of bytes in an ethernet (MAC) address.
michael@657: @@ -44,7 +46,7 @@
michael@657:  /*
michael@657:   * Structure of a DEC/Intel/Xerox or 802.3 Ethernet header.
michael@657:   */
michael@657: -struct	ether_header {
michael@657: +struct	tcpdump_ether_header {
michael@657:  	u_int8_t	ether_dhost[ETHER_ADDR_LEN];
michael@657:  	u_int8_t	ether_shost[ETHER_ADDR_LEN];
michael@657:  	u_int16_t	ether_type;
michael@657: Index: print-ether.c
michael@657: --- print-ether.c.orig	2010-03-12 02:56:44.000000000 +0100
michael@657: +++ print-ether.c	2010-03-31 09:55:05.000000000 +0200
michael@657: @@ -86,10 +86,10 @@
michael@657:  static inline void
michael@657:  ether_hdr_print(register const u_char *bp, u_int length)
michael@657:  {
michael@657: -	register const struct ether_header *ep;
michael@657: +	register const struct tcpdump_ether_header *ep;
michael@657:  	u_int16_t ether_type;
michael@657:  
michael@657: -	ep = (const struct ether_header *)bp;
michael@657: +	ep = (const struct tcpdump_ether_header *)bp;
michael@657:  
michael@657:  	(void)printf("%s > %s",
michael@657:  		     etheraddr_string(ESRC(ep)),
michael@657: @@ -123,7 +123,7 @@
michael@657:  ether_print(const u_char *p, u_int length, u_int caplen,
michael@657:      void (*print_encap_header)(const u_char *), const u_char *encap_header_arg)
michael@657:  {
michael@657: -	struct ether_header *ep;
michael@657: +	struct tcpdump_ether_header *ep;
michael@657:  	u_int orig_length;
michael@657:  	u_short ether_type;
michael@657:  	u_short extracted_ether_type;
michael@657: @@ -142,7 +142,7 @@
michael@657:  
michael@657:  	length -= ETHER_HDRLEN;
michael@657:  	caplen -= ETHER_HDRLEN;
michael@657: -	ep = (struct ether_header *)p;
michael@657: +	ep = (struct tcpdump_ether_header *)p;
michael@657:  	p += ETHER_HDRLEN;
michael@657:  
michael@657:  	ether_type = EXTRACT_16BITS(&ep->ether_type);
michael@657: Index: print-fddi.c
michael@657: --- print-fddi.c.orig	2010-03-12 02:56:44.000000000 +0100
michael@657: +++ print-fddi.c	2010-03-31 09:51:51.000000000 +0200
michael@657: @@ -242,7 +242,7 @@
michael@657:  fddi_print(const u_char *p, u_int length, u_int caplen)
michael@657:  {
michael@657:  	const struct fddi_header *fddip = (const struct fddi_header *)p;
michael@657: -	struct ether_header ehdr;
michael@657: +	struct tcpdump_ether_header ehdr;
michael@657:  	u_short extracted_ethertype;
michael@657:  
michael@657:  	if (caplen < FDDI_HDRLEN) {
michael@657: Index: print-ipfc.c
michael@657: --- print-ipfc.c.orig	2010-03-12 02:56:44.000000000 +0100
michael@657: +++ print-ipfc.c	2010-03-31 09:51:51.000000000 +0200
michael@657: @@ -81,7 +81,7 @@
michael@657:  ipfc_print(const u_char *p, u_int length, u_int caplen)
michael@657:  {
michael@657:  	const struct ipfc_header *ipfcp = (const struct ipfc_header *)p;
michael@657: -	struct ether_header ehdr;
michael@657: +	struct tcpdump_ether_header ehdr;
michael@657:  	u_short extracted_ethertype;
michael@657:  
michael@657:  	if (caplen < IPFC_HDRLEN) {
michael@657: Index: print-rrcp.c
michael@657: --- print-rrcp.c.orig	2010-03-12 02:56:44.000000000 +0100
michael@657: +++ print-rrcp.c	2010-03-31 09:55:19.000000000 +0200
michael@657: @@ -88,11 +88,11 @@
michael@657:  	const u_char *rrcp;
michael@657:  	u_int8_t rrcp_proto;
michael@657:  	u_int8_t rrcp_opcode;
michael@657: -	register const struct ether_header *ep;
michael@657: +	register const struct tcpdump_ether_header *ep;
michael@657:  	char proto_str[16];
michael@657:  	char opcode_str[32];
michael@657:  
michael@657: -	ep = (const struct ether_header *)cp;
michael@657: +	ep = (const struct tcpdump_ether_header *)cp;
michael@657:  	rrcp = cp + ETHER_HDRLEN;
michael@657:  
michael@657:  	ND_TCHECK(*(rrcp + RRCP_PROTO_OFFSET));
michael@657: Index: print-token.c
michael@657: --- print-token.c.orig	2010-03-12 02:56:44.000000000 +0100
michael@657: +++ print-token.c	2010-03-31 09:51:51.000000000 +0200
michael@657: @@ -103,7 +103,7 @@
michael@657:  {
michael@657:  	const struct token_header *trp;
michael@657:  	u_short extracted_ethertype;
michael@657: -	struct ether_header ehdr;
michael@657: +	struct tcpdump_ether_header ehdr;
michael@657:  	u_int route_len = 0, hdr_len = TOKEN_HDRLEN;
michael@657:  	int seg;
michael@657:  
michael@657: Index: print-pflog.c
michael@657: --- print-pflog.c.orig	2010-03-12 02:56:44.000000000 +0100
michael@657: +++ print-pflog.c	2010-03-31 10:00:24.000000000 +0200
michael@657: @@ -44,6 +44,7 @@
michael@657:  
michael@657:  #include "interface.h"
michael@657:  #include "addrtoname.h"
michael@657: +#include "extract.h"
michael@657:  
michael@657:  static struct tok pf_reasons[] = {
michael@657:  	{ 0,	"0(match)" },