21c21
< * @(#) $Header: /tcpdump/master/tcpdump/interface.h,v 1.178.4.2 2002/07/10 07:32:17 guy Exp $ (LBL)
---
> * @(#) $Header: /tcpdump/master/tcpdump/interface.h,v 1.217.2.5 2004/03/17 19:47:48 guy Exp $ (LBL)
23c23
< * $FreeBSD: head/contrib/tcpdump/interface.h 111729 2003-03-02 08:25:48Z fenner $
---
> * $FreeBSD: head/contrib/tcpdump/interface.h 127675 2004-03-31 14:57:24Z bms $
32,33d31
< #include <sys/types.h>
< #include <sys/time.h>
63a62,65
> #ifndef HAVE_STRSEP
> extern char *strsep(char **, const char *);
> #endif
>
84c86
<
---
> extern int Aflag; /* print packet only in ascii observing TAB, LF, CR and SPACE as graphical chars */
94a97,98
> #define PT_TFTP 8 /* trivial file transfer protocol */
> #define PT_AODV 9 /* Ad-hoc On-demand Distance Vector Protocol */
134,135c138
< /* global pointers to beginning and end of current packet (during printing) */
< extern const u_char *packetp;
---
> /* global pointer to end of current packet (during printing) */
163a167,168
> extern int mask2plen(u_int32_t);
> extern char *bittok2str(const struct tok *, const char *, int);
169,172d173
< extern void info(int);
< extern int infodelay;
< extern int infoprint;
<
194,198c195,200
< extern void ascii_print_with_offset(const u_char *, u_int, u_int);
< extern void ascii_print(const u_char *, u_int);
< extern void hex_print_with_offset(const u_char *, u_int, u_int);
< extern void telnet_print(const u_char *, u_int);
< extern void hex_print(const u_char *, u_int);
---
> extern int print_unknown_data(const u_char *, const char *,int);
> extern void ascii_print_with_offset(const u_char *, const u_char *, u_int, u_int);
> extern void ascii_print(const u_char *, const u_char *, u_int);
> extern void hex_print_with_offset(const u_char *, const u_char *, u_int, u_int);
> extern void telnet_print(const u_char *, u_int);
> extern void hex_print(const u_char *, const u_char *, u_int);
201a204,205
> extern int snap_print(const u_char *, u_int, u_int, u_short *, u_int32_t,
> u_short, u_int);
202a207
> extern void aodv_print(const u_char *, u_int, int);
205,206c210,213
< extern void atm_if_print(u_char *, const struct pcap_pkthdr *, const u_char *);
< extern void bootp_print(const u_char *, u_int, u_short, u_short);
---
> extern void atm_print(u_int, u_int, u_int, const u_char *, u_int, u_int);
> extern u_int atm_if_print(const struct pcap_pkthdr *, const u_char *);
> extern u_int sunatm_if_print(const struct pcap_pkthdr *, const u_char *);
> extern void bootp_print(const u_char *, u_int);
209c216
< extern void cnfp_print(const u_char *, u_int, const u_char *);
---
> extern void cnfp_print(const u_char *, const u_char *);
214,215c221,234
< extern void egp_print(const u_char *, u_int, const u_char *);
< extern void arcnet_if_print(u_char *, const struct pcap_pkthdr *,
---
> extern void egp_print(const u_char *);
> 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 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 *);
> extern void fddi_print(const u_char *, u_int, u_int);
> extern u_int fddi_if_print(const struct pcap_pkthdr *, const u_char *);
> extern u_int fr_if_print(const struct pcap_pkthdr *, const u_char *);
> extern u_int ieee802_11_if_print(const struct pcap_pkthdr *, const u_char *);
> extern u_int ieee802_11_radio_if_print(const struct pcap_pkthdr *,
217,223c236
< extern void ether_if_print(u_char *, const struct pcap_pkthdr *,
< const u_char *);
< extern void token_if_print(u_char *, const struct pcap_pkthdr *,
< const u_char *);
< extern void fddi_if_print(u_char *, const struct pcap_pkthdr *, const u_char *);
< extern void ieee802_11_if_print(u_char *, const struct pcap_pkthdr *,
< const u_char *);
---
> extern u_int ap1394_if_print(const struct pcap_pkthdr *, const u_char *);
225c238
< extern void icmp_print(const u_char *, u_int, const u_char *);
---
> extern void icmp_print(const u_char *, u_int, const u_char *, int);
229a243
> extern u_int ipfc_if_print(const struct pcap_pkthdr *, const u_char *);
231,236c245,248
< extern void isoclns_print(const u_char *, u_int, u_int, const u_char *,
< const u_char *);
< extern void krb_print(const u_char *, u_int);
< extern void llap_print(const u_char *, u_int);
< extern void ltalk_if_print(u_char *, const struct pcap_pkthdr *,
< const u_char *);
---
> extern void isoclns_print(const u_char *, u_int, u_int);
> extern void krb_print(const u_char *);
> extern u_int llap_print(const u_char *, u_int);
> extern u_int ltalk_if_print(const struct pcap_pkthdr *, const u_char *);
240c252
< extern void ns_print(const u_char *, u_int);
---
> extern void ns_print(const u_char *, u_int, int);
242c254
< extern void null_if_print(u_char *, const struct pcap_pkthdr *, const u_char *);
---
> extern u_int null_if_print(const struct pcap_pkthdr *, const u_char *);
245a258,259
> extern void rsvp_print(const u_char *, u_int);
> extern void ldp_print(const u_char *, u_int);
248,258c262,270
< extern void pppoe_print(const u_char *, u_int);
< extern void ppp_print(register const u_char *, u_int);
< extern void ppp_if_print(u_char *, const struct pcap_pkthdr *, const u_char *);
< extern void ppp_hdlc_if_print(u_char *, const struct pcap_pkthdr *,
< const u_char *);
< extern void ppp_bsdos_if_print(u_char *, const struct pcap_pkthdr *,
< const u_char *);
< extern void pppoe_if_print(u_char *, const struct pcap_pkthdr *,
< const u_char *);
< extern int vjc_print(register const char *, register u_int, u_short);
< extern void raw_if_print(u_char *, const struct pcap_pkthdr *, const u_char *);
---
> 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 *);
> extern u_int ppp_hdlc_if_print(const struct pcap_pkthdr *, const u_char *);
> extern u_int ppp_bsdos_if_print(const struct pcap_pkthdr *, const u_char *);
> extern u_int pppoe_if_print(const struct pcap_pkthdr *, const u_char *);
> extern u_int prism_if_print(const struct pcap_pkthdr *, const u_char *);
> extern int vjc_print(register const char *, u_short);
> extern u_int raw_if_print(const struct pcap_pkthdr *, const u_char *);
260,268c272,278
< extern void sl_if_print(u_char *, const struct pcap_pkthdr *, const u_char *);
< extern void lane_if_print(u_char *, const struct pcap_pkthdr *,const u_char *);
< extern void cip_if_print(u_char *, const struct pcap_pkthdr *,const u_char *);
< extern void sl_bsdos_if_print(u_char *, const struct pcap_pkthdr *,
< const u_char *);
< extern void chdlc_if_print(u_char *, const struct pcap_pkthdr *,
< const u_char *);
< extern void chdlc_print(register const u_char *, u_int, u_int);
< extern void sll_if_print(u_char *, const struct pcap_pkthdr *, const u_char *);
---
> extern u_int sl_if_print(const struct pcap_pkthdr *, const u_char *);
> extern void lane_print(const u_char *, u_int, u_int);
> extern u_int lane_if_print(const struct pcap_pkthdr *, const u_char *);
> extern u_int cip_if_print(const struct pcap_pkthdr *, const u_char *);
> extern u_int sl_bsdos_if_print(const struct pcap_pkthdr *, const u_char *);
> extern u_int chdlc_if_print(const struct pcap_pkthdr *, const u_char *);
> extern u_int sll_if_print(const struct pcap_pkthdr *, const u_char *);
273c283
< extern void timed_print(const u_char *, u_int);
---
> extern void timed_print(const u_char *);
276c286
< extern int ah_print(register const u_char *, register const u_char *);
---
> extern int ah_print(register const u_char *);
279c289
< extern int ipcomp_print(register const u_char *, register const u_char *, int *);
---
> extern int ipcomp_print(register const u_char *, int *);
289d298
< extern void lcp_print(const u_char *, u_int);
291,292c300
< extern void cdp_print(const u_char *, u_int, u_int, const u_char *,
< const u_char *);
---
> extern void cdp_print(const u_char *, u_int, u_int);
296c304
< extern void pptp_print(const u_char *, u_int);
---
> extern void pptp_print(const u_char *);
298a307
> extern void mpls_lsp_ping_print(const u_char *, u_int);
300a310
> extern void bfd_print(const u_char *, u_int, u_int);
308c318,319
< extern void icmp6_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);
312c323
< extern void dhcp6_print(const u_char *, u_int, u_int16_t, u_int16_t);
---
> extern void dhcp6_print(const u_char *, u_int);
314a326
> extern u_int16_t in_cksum_shouldbe(u_int16_t, u_int16_t);
< * @(#) $Header: /tcpdump/master/tcpdump/interface.h,v 1.178.4.2 2002/07/10 07:32:17 guy Exp $ (LBL)
---
> * @(#) $Header: /tcpdump/master/tcpdump/interface.h,v 1.217.2.5 2004/03/17 19:47:48 guy Exp $ (LBL)
23c23
< * $FreeBSD: head/contrib/tcpdump/interface.h 111729 2003-03-02 08:25:48Z fenner $
---
> * $FreeBSD: head/contrib/tcpdump/interface.h 127675 2004-03-31 14:57:24Z bms $
32,33d31
< #include <sys/types.h>
< #include <sys/time.h>
63a62,65
> #ifndef HAVE_STRSEP
> extern char *strsep(char **, const char *);
> #endif
>
84c86
<
---
> extern int Aflag; /* print packet only in ascii observing TAB, LF, CR and SPACE as graphical chars */
94a97,98
> #define PT_TFTP 8 /* trivial file transfer protocol */
> #define PT_AODV 9 /* Ad-hoc On-demand Distance Vector Protocol */
134,135c138
< /* global pointers to beginning and end of current packet (during printing) */
< extern const u_char *packetp;
---
> /* global pointer to end of current packet (during printing) */
163a167,168
> extern int mask2plen(u_int32_t);
> extern char *bittok2str(const struct tok *, const char *, int);
169,172d173
< extern void info(int);
< extern int infodelay;
< extern int infoprint;
<
194,198c195,200
< extern void ascii_print_with_offset(const u_char *, u_int, u_int);
< extern void ascii_print(const u_char *, u_int);
< extern void hex_print_with_offset(const u_char *, u_int, u_int);
< extern void telnet_print(const u_char *, u_int);
< extern void hex_print(const u_char *, u_int);
---
> extern int print_unknown_data(const u_char *, const char *,int);
> extern void ascii_print_with_offset(const u_char *, const u_char *, u_int, u_int);
> extern void ascii_print(const u_char *, const u_char *, u_int);
> extern void hex_print_with_offset(const u_char *, const u_char *, u_int, u_int);
> extern void telnet_print(const u_char *, u_int);
> extern void hex_print(const u_char *, const u_char *, u_int);
201a204,205
> extern int snap_print(const u_char *, u_int, u_int, u_short *, u_int32_t,
> u_short, u_int);
202a207
> extern void aodv_print(const u_char *, u_int, int);
205,206c210,213
< extern void atm_if_print(u_char *, const struct pcap_pkthdr *, const u_char *);
< extern void bootp_print(const u_char *, u_int, u_short, u_short);
---
> extern void atm_print(u_int, u_int, u_int, const u_char *, u_int, u_int);
> extern u_int atm_if_print(const struct pcap_pkthdr *, const u_char *);
> extern u_int sunatm_if_print(const struct pcap_pkthdr *, const u_char *);
> extern void bootp_print(const u_char *, u_int);
209c216
< extern void cnfp_print(const u_char *, u_int, const u_char *);
---
> extern void cnfp_print(const u_char *, const u_char *);
214,215c221,234
< extern void egp_print(const u_char *, u_int, const u_char *);
< extern void arcnet_if_print(u_char *, const struct pcap_pkthdr *,
---
> extern void egp_print(const u_char *);
> 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 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 *);
> extern void fddi_print(const u_char *, u_int, u_int);
> extern u_int fddi_if_print(const struct pcap_pkthdr *, const u_char *);
> extern u_int fr_if_print(const struct pcap_pkthdr *, const u_char *);
> extern u_int ieee802_11_if_print(const struct pcap_pkthdr *, const u_char *);
> extern u_int ieee802_11_radio_if_print(const struct pcap_pkthdr *,
217,223c236
< extern void ether_if_print(u_char *, const struct pcap_pkthdr *,
< const u_char *);
< extern void token_if_print(u_char *, const struct pcap_pkthdr *,
< const u_char *);
< extern void fddi_if_print(u_char *, const struct pcap_pkthdr *, const u_char *);
< extern void ieee802_11_if_print(u_char *, const struct pcap_pkthdr *,
< const u_char *);
---
> extern u_int ap1394_if_print(const struct pcap_pkthdr *, const u_char *);
225c238
< extern void icmp_print(const u_char *, u_int, const u_char *);
---
> extern void icmp_print(const u_char *, u_int, const u_char *, int);
229a243
> extern u_int ipfc_if_print(const struct pcap_pkthdr *, const u_char *);
231,236c245,248
< extern void isoclns_print(const u_char *, u_int, u_int, const u_char *,
< const u_char *);
< extern void krb_print(const u_char *, u_int);
< extern void llap_print(const u_char *, u_int);
< extern void ltalk_if_print(u_char *, const struct pcap_pkthdr *,
< const u_char *);
---
> extern void isoclns_print(const u_char *, u_int, u_int);
> extern void krb_print(const u_char *);
> extern u_int llap_print(const u_char *, u_int);
> extern u_int ltalk_if_print(const struct pcap_pkthdr *, const u_char *);
240c252
< extern void ns_print(const u_char *, u_int);
---
> extern void ns_print(const u_char *, u_int, int);
242c254
< extern void null_if_print(u_char *, const struct pcap_pkthdr *, const u_char *);
---
> extern u_int null_if_print(const struct pcap_pkthdr *, const u_char *);
245a258,259
> extern void rsvp_print(const u_char *, u_int);
> extern void ldp_print(const u_char *, u_int);
248,258c262,270
< extern void pppoe_print(const u_char *, u_int);
< extern void ppp_print(register const u_char *, u_int);
< extern void ppp_if_print(u_char *, const struct pcap_pkthdr *, const u_char *);
< extern void ppp_hdlc_if_print(u_char *, const struct pcap_pkthdr *,
< const u_char *);
< extern void ppp_bsdos_if_print(u_char *, const struct pcap_pkthdr *,
< const u_char *);
< extern void pppoe_if_print(u_char *, const struct pcap_pkthdr *,
< const u_char *);
< extern int vjc_print(register const char *, register u_int, u_short);
< extern void raw_if_print(u_char *, const struct pcap_pkthdr *, const u_char *);
---
> 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 *);
> extern u_int ppp_hdlc_if_print(const struct pcap_pkthdr *, const u_char *);
> extern u_int ppp_bsdos_if_print(const struct pcap_pkthdr *, const u_char *);
> extern u_int pppoe_if_print(const struct pcap_pkthdr *, const u_char *);
> extern u_int prism_if_print(const struct pcap_pkthdr *, const u_char *);
> extern int vjc_print(register const char *, u_short);
> extern u_int raw_if_print(const struct pcap_pkthdr *, const u_char *);
260,268c272,278
< extern void sl_if_print(u_char *, const struct pcap_pkthdr *, const u_char *);
< extern void lane_if_print(u_char *, const struct pcap_pkthdr *,const u_char *);
< extern void cip_if_print(u_char *, const struct pcap_pkthdr *,const u_char *);
< extern void sl_bsdos_if_print(u_char *, const struct pcap_pkthdr *,
< const u_char *);
< extern void chdlc_if_print(u_char *, const struct pcap_pkthdr *,
< const u_char *);
< extern void chdlc_print(register const u_char *, u_int, u_int);
< extern void sll_if_print(u_char *, const struct pcap_pkthdr *, const u_char *);
---
> extern u_int sl_if_print(const struct pcap_pkthdr *, const u_char *);
> extern void lane_print(const u_char *, u_int, u_int);
> extern u_int lane_if_print(const struct pcap_pkthdr *, const u_char *);
> extern u_int cip_if_print(const struct pcap_pkthdr *, const u_char *);
> extern u_int sl_bsdos_if_print(const struct pcap_pkthdr *, const u_char *);
> extern u_int chdlc_if_print(const struct pcap_pkthdr *, const u_char *);
> extern u_int sll_if_print(const struct pcap_pkthdr *, const u_char *);
273c283
< extern void timed_print(const u_char *, u_int);
---
> extern void timed_print(const u_char *);
276c286
< extern int ah_print(register const u_char *, register const u_char *);
---
> extern int ah_print(register const u_char *);
279c289
< extern int ipcomp_print(register const u_char *, register const u_char *, int *);
---
> extern int ipcomp_print(register const u_char *, int *);
289d298
< extern void lcp_print(const u_char *, u_int);
291,292c300
< extern void cdp_print(const u_char *, u_int, u_int, const u_char *,
< const u_char *);
---
> extern void cdp_print(const u_char *, u_int, u_int);
296c304
< extern void pptp_print(const u_char *, u_int);
---
> extern void pptp_print(const u_char *);
298a307
> extern void mpls_lsp_ping_print(const u_char *, u_int);
300a310
> extern void bfd_print(const u_char *, u_int, u_int);
308c318,319
< extern void icmp6_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);
312c323
< extern void dhcp6_print(const u_char *, u_int, u_int16_t, u_int16_t);
---
> extern void dhcp6_print(const u_char *, u_int);
314a326
> extern u_int16_t in_cksum_shouldbe(u_int16_t, u_int16_t);