X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/176a3e498602351ae25833cf7456c1e30f7f59ae..b34c1cc75009cdd36d008066f5b11de75e9ccee0:/interface.h diff --git a/interface.h b/interface.h index 1113d482..439854f3 100644 --- a/interface.h +++ b/interface.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1999, 2000 + * Copyright (c) 1988-2002 * The Regents of the University of California. All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -18,7 +18,7 @@ * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * @(#) $Header: /tcpdump/master/tcpdump/interface.h,v 1.166 2001-07-05 18:54:13 guy Exp $ (LBL) + * @(#) $Header: /tcpdump/master/tcpdump/interface.h,v 1.198 2002-12-04 19:09:30 hannes Exp $ (LBL) */ #ifndef tcpdump_interface_h @@ -27,13 +27,13 @@ #ifdef HAVE_OS_PROTO_H #include "os-proto.h" #endif -#include -#include #ifndef HAVE___ATTRIBUTE__ #define __attribute__(x) #endif +#define _U_ __attribute__((unused)) + /* snprintf et al */ #include @@ -61,7 +61,7 @@ extern char *strdup(const char *); struct tok { int v; /* value */ - char *s; /* string */ + const char *s; /* string */ }; extern int aflag; /* translate network and broadcast addresses */ @@ -79,7 +79,7 @@ extern int uflag; /* Print undecoded NFS handles */ extern int vflag; /* verbose */ extern int xflag; /* print packet in hex */ extern int Xflag; /* print packet in hex/ascii */ - +extern int Aflag; /* print packet only in ascii observing TAB, LF, CR and SPACE as graphical chars */ extern char *espsecret; extern int packettype; /* as specified by -T */ @@ -133,8 +133,16 @@ extern int snaplen; extern const u_char *packetp; extern const u_char *snapend; -/* True if "l" bytes of "var" were captured */ -#define TTEST2(var, l) ((u_char *)&(var) <= snapend - (l)) +/* + * True if "l" bytes of "var" were captured. + * + * The "snapend - (l) <= snapend" checks to make sure "l" isn't so large + * that "snapend - (l)" underflows. + * + * The check is for <= rather than < because "l" might be 0. + */ +#define TTEST2(var, l) (snapend - (l) <= snapend && \ + (const u_char *)&(var) <= snapend - (l)) /* True if "var" was captured */ #define TTEST(var) TTEST2(var, sizeof(var)) @@ -151,7 +159,11 @@ extern void relts_print(int); extern int fn_print(const u_char *, const u_char *); extern int fn_printn(const u_char *, u_int, const u_char *); extern const char *tok2str(const struct tok *, const char *, int); -extern char *dnaddr_string(u_short); +extern char *bittok2str(const struct tok *, const char *, int); +extern const char *tok2strary_internal(const char **, int, const char *, int); +#define tok2strary(a,f,i) tok2strary_internal(a, sizeof(a)/sizeof(a[0]),f,i) + +extern const char *dnaddr_string(u_short); extern void info(int); extern int infodelay; @@ -167,59 +179,73 @@ extern char *copy_argv(char **); extern void safeputchar(int); extern void safeputs(const char *); -extern char *isonsap_string(const u_char *); -extern char *llcsap_string(u_char); -extern char *protoid_string(const u_char *); -extern char *dnname_string(u_short); -extern char *dnnum_string(u_short); +extern const char *isonsap_string(const u_char *); +extern const char *llcsap_string(u_char); +extern const char *protoid_string(const u_char *); +extern const char *ipxsap_string(u_short); +extern const char *dnname_string(u_short); +extern const char *dnnum_string(u_short); /* The printer routines. */ #include -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 *, 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 ether_encap_print(u_short, const u_char *, u_int, u_int, u_short *); 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_int32_t, + u_short, u_int); extern void aarp_print(const u_char *, u_int); extern void arp_print(const u_char *, u_int, u_int); extern void atalk_print(const u_char *, u_int); +extern void atm_print(u_int, u_int, u_int, const u_char *, u_int, u_int); 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 sunatm_if_print(u_char *, const struct pcap_pkthdr *, const u_char *); +extern void bootp_print(const u_char *, u_short, u_short, u_int); extern void bgp_print(const u_char *, int); -extern void bxxp_print(const u_char *, u_int); -extern void cnfp_print(const u_char *, u_int, const u_char *); +extern void beep_print(const u_char *, u_int); +extern void cnfp_print(const u_char *, const u_char *); extern void decnet_print(const u_char *, u_int, u_int); extern void default_print(const u_char *, u_int); extern void default_print_unaligned(const u_char *, u_int); extern void dvmrp_print(const u_char *, u_int); -extern void egp_print(const u_char *, u_int, const u_char *); +extern void egp_print(const u_char *); +extern void pflog_if_print(u_char *, const struct pcap_pkthdr *, + const u_char *); extern void arcnet_if_print(u_char *, const struct pcap_pkthdr *, const u_char *); +extern void ether_print(const u_char *, u_int, u_int); extern void ether_if_print(u_char *, const struct pcap_pkthdr *, const u_char *); +extern u_int token_print(const u_char *, u_int, u_int); extern void token_if_print(u_char *, const struct pcap_pkthdr *, const u_char *); +extern void fddi_print(const u_char *, u_int, u_int); extern void fddi_if_print(u_char *, const struct pcap_pkthdr *, const u_char *); +extern void fr_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 void gre_print(const u_char *, u_int); extern void icmp_print(const u_char *, u_int, const u_char *); -extern void igmp_print(const u_char *, u_int, const u_char *); +extern void igmp_print(const u_char *, u_int); extern void igrp_print(const u_char *, u_int, const u_char *); extern void ip_print(const u_char *, u_int); extern void ipN_print(const u_char *, u_int); +extern void ipfc_if_print(u_char *, const struct pcap_pkthdr *, const u_char *); extern void ipx_print(const u_char *, u_int); 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 krb_print(const u_char *); 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 msdp_print(const unsigned char *, u_int); extern void nfsreply_print(const u_char *, u_int, const u_char *); extern void nfsreq_print(const u_char *, u_int, const u_char *); extern void ns_print(const u_char *, u_int); @@ -228,10 +254,11 @@ extern void null_if_print(u_char *, const struct pcap_pkthdr *, const u_char *); extern void ospf_print(const u_char *, u_int, const u_char *); 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); extern void mobile_print(const u_char *, u_int); extern void pim_print(const u_char *, u_int); -extern void pppoe_print(const u_char *, u_int); -extern void ppp_print(register const u_char *, u_int); +extern u_int pppoe_print(const u_char *, u_int); +extern u_int 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 *); @@ -239,10 +266,11 @@ 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 int vjc_print(register const char *, u_short); extern void raw_if_print(u_char *, const struct pcap_pkthdr *, const u_char *); extern void rip_print(const u_char *, u_int); extern void sl_if_print(u_char *, const struct pcap_pkthdr *, const u_char *); +extern void lane_print(const u_char *, u_int, u_int); 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 *, @@ -255,13 +283,13 @@ extern void snmp_print(const u_char *, u_int); extern void sunrpcrequest_print(const u_char *, u_int, const u_char *); extern void tcp_print(const u_char *, u_int, const u_char *, int); extern void tftp_print(const u_char *, u_int); -extern void timed_print(const u_char *, u_int); +extern void timed_print(const u_char *); extern void udp_print(const u_char *, u_int, const u_char *, int); extern void wb_print(const void *, u_int); -extern int ah_print(register const u_char *, register const u_char *); -extern int esp_print(register const u_char *, register const u_char *, int *); +extern int ah_print(register const u_char *); +extern int esp_print(register const u_char *, register const u_char *, int *, int *); extern void isakmp_print(const u_char *, u_int, const u_char *); -extern int ipcomp_print(register const u_char *, register const u_char *, int *); +extern int ipcomp_print(register const u_char *, int *); extern void rx_print(register const u_char *, int, int, int, u_char *); extern void netbeui_print(u_short, const u_char *, int); extern void ipx_netbios_print(const u_char *, u_int); @@ -271,33 +299,45 @@ extern void nbt_udp138_print(const u_char *, int); extern char *smb_errstr(int, int); extern void print_data(const unsigned char *, int); extern void l2tp_print(const u_char *, u_int); -extern void lcp_print(const u_char *, u_int); extern void vrrp_print(const u_char *, u_int, int); -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); extern void stp_print(const u_char *, u_int); extern void radius_print(const u_char *, u_int); extern void lwres_print(const u_char *, u_int); -extern void pptp_print(const u_char *, u_int); +extern void pptp_print(const u_char *); extern void sctp_print(const u_char *, const u_char *, u_int); extern void mpls_print(const u_char *, u_int); +extern void zephyr_print(const u_char *, int); +extern void hsrp_print(const u_char *, u_int); #ifdef INET6 -extern void ip6_print(const u_char *, int); +extern void ip6_print(const u_char *, u_int); extern void ip6_opt_print(const u_char *, 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 *, const u_char *); -extern void ripng_print(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, u_int16_t, u_int16_t); #endif /*INET6*/ -extern u_short in_cksum(const u_short *, register int, u_short); +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); #ifndef HAVE_BPF_DUMP struct bpf_program; extern void bpf_dump(struct bpf_program *, int); #endif + + + + + + + + + +