diff options
Diffstat (limited to 'contrib/tcpdump/interface.h')
-rw-r--r-- | contrib/tcpdump/interface.h | 38 |
1 files changed, 14 insertions, 24 deletions
diff --git a/contrib/tcpdump/interface.h b/contrib/tcpdump/interface.h index 5e4a5eb..6e04b058 100644 --- a/contrib/tcpdump/interface.h +++ b/contrib/tcpdump/interface.h @@ -18,8 +18,7 @@ * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * $FreeBSD$ - * @(#) $Header: /tcpdump/master/tcpdump/interface.h,v 1.280.2.4 2008-04-04 19:42:52 guy Exp $ (LBL) + * @(#) $Header: /tcpdump/master/tcpdump/interface.h,v 1.285 2008-08-16 11:36:20 hannes Exp $ (LBL) */ #ifndef tcpdump_interface_h @@ -83,21 +82,6 @@ extern char *strsep(char **, const char *); #define max(a,b) ((b)>(a)?(b):(a)) #endif -/* - * The default snapshot length. This value allows most printers to print - * useful information while keeping the amount of unwanted data down. - */ -#ifndef INET6 -#define DEFAULT_SNAPLEN 68 /* ether + IPv4 + TCP + 14 */ -#else -#define DEFAULT_SNAPLEN 96 /* ether + IPv6 + TCP + 22 */ -#endif - -#ifndef BIG_ENDIAN -#define BIG_ENDIAN 4321 -#define LITTLE_ENDIAN 1234 -#endif - #define ESRC(ep) ((ep)->ether_shost) #define EDST(ep) ((ep)->ether_dhost) @@ -182,10 +166,10 @@ extern void hex_and_ascii_print(const char *, const u_char *, u_int); extern void hex_print_with_offset(const char *, const u_char *, u_int, u_int); extern void hex_print(const char *, const u_char *, u_int); extern void telnet_print(const u_char *, u_int); -extern int ether_encap_print(u_short, const u_char *, u_int, u_int, u_short *); +extern int ethertype_print(u_short, const u_char *, u_int, u_int); extern int llc_print(const u_char *, u_int, u_int, const u_char *, const u_char *, u_short *); -extern int snap_print(const u_char *, u_int, u_int, u_short *, u_int); +extern int snap_print(const u_char *, u_int, u_int, u_int); extern void aarp_print(const u_char *, u_int); extern void aodv_print(const u_char *, u_int, int); extern void atalk_print(const u_char *, u_int); @@ -205,7 +189,8 @@ extern u_int enc_if_print(const struct pcap_pkthdr *, const u_char *); extern u_int pflog_if_print(const struct pcap_pkthdr *, const u_char *); extern u_int arcnet_if_print(const struct pcap_pkthdr *, const u_char *); extern u_int arcnet_linux_if_print(const struct pcap_pkthdr *, const u_char *); -extern void ether_print(const u_char *, u_int, u_int); +extern void ether_print(const u_char *, u_int, u_int, + void (*)(const u_char *), const u_char *); extern u_int ether_if_print(const struct pcap_pkthdr *, const u_char *); extern u_int token_print(const u_char *, u_int, u_int); extern u_int token_if_print(const struct pcap_pkthdr *, const u_char *); @@ -240,7 +225,7 @@ extern void ns_print(const u_char *, u_int, int); extern void ntp_print(const u_char *, u_int); extern u_int null_if_print(const struct pcap_pkthdr *, const u_char *); extern void ospf_print(const u_char *, u_int, const u_char *); -extern void olsr_print (const u_char *, u_int); +extern void olsr_print (const u_char *, u_int, int); extern void pimv1_print(const u_char *, u_int); extern void cisco_autorp_print(const u_char *, u_int); extern void rsvp_print(const u_char *, u_int); @@ -252,7 +237,7 @@ extern void lwapp_control_print(const u_char *, u_int, int); extern void lwapp_data_print(const u_char *, u_int); extern void eigrp_print(const u_char *, u_int); extern void mobile_print(const u_char *, u_int); -extern void pim_print(const u_char *, u_int); +extern void pim_print(const u_char *, u_int, u_int); extern u_int pppoe_print(const u_char *, u_int); extern u_int ppp_print(register const u_char *, u_int); extern u_int ppp_if_print(const struct pcap_pkthdr *, const u_char *); @@ -325,6 +310,7 @@ extern void lwres_print(const u_char *, u_int); extern void pptp_print(const u_char *); extern void dccp_print(const u_char *, const u_char *, u_int); extern void sctp_print(const u_char *, const u_char *, u_int); +extern void forces_print(const u_char *, u_int); extern void mpls_print(const u_char *, u_int); extern void mpls_lsp_ping_print(const u_char *, u_int); extern void zephyr_print(const u_char *, int); @@ -333,19 +319,22 @@ extern void bfd_print(const u_char *, u_int, u_int); extern void sip_print(const u_char *, u_int); extern void syslog_print(const u_char *, u_int); extern u_int bt_if_print(const struct pcap_pkthdr *, const u_char *); +extern u_int usb_linux_48_byte_print(const struct pcap_pkthdr *, const u_char *); +extern u_int usb_linux_64_byte_print(const struct pcap_pkthdr *, const u_char *); #ifdef INET6 extern void ip6_print(const u_char *, u_int); extern void ip6_opt_print(const u_char *, int); +extern int nextproto6_cksum(const struct ip6_hdr *, const u_short *, u_int, u_int); extern int hbhopt_print(const u_char *); extern int dstopt_print(const u_char *); extern int frag6_print(const u_char *, const u_char *); extern int mobility_print(const u_char *, const u_char *); -extern void icmp6_print(const u_char *, u_int, const u_char *, int); extern void ripng_print(const u_char *, unsigned int); extern int rt6_print(const u_char *, const u_char *); extern void ospf6_print(const u_char *, u_int); extern void dhcp6_print(const u_char *, u_int); +extern int mask62plen(const u_char *); #endif /*INET6*/ extern u_short in_cksum(const u_short *, register u_int, int); extern u_int16_t in_cksum_shouldbe(u_int16_t, u_int16_t); @@ -364,6 +353,7 @@ extern void bpf_dump(const struct bpf_program *, int); #ifndef NETDISSECT_REWORKED extern netdissect_options *gndo; +#define bflag gndo->ndo_bflag #define eflag gndo->ndo_eflag #define fflag gndo->ndo_fflag #define Kflag gndo->ndo_Kflag @@ -388,7 +378,7 @@ extern netdissect_options *gndo; #define Iflag gndo->ndo_Iflag #define suppress_default_print gndo->ndo_suppress_default_print #define packettype gndo->ndo_packettype -#define tcpmd5secret gndo->ndo_tcpmd5secret +#define sigsecret gndo->ndo_sigsecret #define Wflag gndo->ndo_Wflag #define WflagChars gndo->ndo_WflagChars #define Cflag_count gndo->ndo_Cflag_count |