X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/fc80a87e4c7e921dca5edcf53373f60a76123a41..309ca62193772fd8ba532fd413b51a61be0c741e:/netdissect.h diff --git a/netdissect.h b/netdissect.h index e471ace4..0c66dfaf 100644 --- a/netdissect.h +++ b/netdissect.h @@ -21,7 +21,7 @@ * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * @(#) $Header: /tcpdump/master/tcpdump/netdissect.h,v 1.8 2004-04-30 16:42:14 mcr Exp $ (LBL) + * @(#) $Header: /tcpdump/master/tcpdump/netdissect.h,v 1.27 2008-08-16 11:36:20 hannes Exp $ (LBL) */ #ifndef netdissect_h @@ -31,7 +31,6 @@ #include "os-proto.h" #endif #include -#include #ifndef HAVE___ATTRIBUTE__ #define __attribute__(x) @@ -62,6 +61,10 @@ extern size_t strlcpy (char *, const char *, size_t); extern char *strdup (const char *str); #endif +#ifndef HAVE_STRSEP +extern char *strsep(char **, const char *); +#endif + struct tok { int v; /* value */ const char *s; /* string */ @@ -74,15 +77,17 @@ extern const char *tok2strbuf(const struct tok *, const char *, int, /* tok2str is deprecated */ extern const char *tok2str(const struct tok *, const char *, int); extern char *bittok2str(const struct tok *, const char *, int); +extern char *bittok2str_nosep(const struct tok *, const char *, int); typedef struct netdissect_options netdissect_options; struct netdissect_options { int ndo_aflag; /* translate network and broadcast addresses */ - int ndo_dflag; /* print filter code */ + int ndo_bflag; /* print 4 byte ASes in ASDOT notation */ int ndo_eflag; /* print ethernet header */ int ndo_fflag; /* don't translate "foreign" IP address */ + int ndo_Kflag; /* don't check TCP checksums */ int ndo_nflag; /* leave addresses as numbers */ int ndo_Nflag; /* remove domains from printed host names */ int ndo_qflag; /* quick (shorter) output */ @@ -98,21 +103,29 @@ struct netdissect_options { int ndo_Aflag; /* print packet only in ascii observing TAB, * LF, CR and SPACE as graphical chars */ + int ndo_Bflag; /* buffer size */ + int ndo_Iflag; /* rfmon (monitor) mode */ int ndo_Oflag; /* run filter code optimizer */ int ndo_dlt; /* if != -1, ask libpcap for the DLT it names*/ + int ndo_jflag; /* packet time stamp source */ int ndo_pflag; /* don't go promiscuous */ int ndo_Cflag; /* rotate dump files after this many bytes */ int ndo_Cflag_count; /* Keep track of which file number we're writing */ + int ndo_Gflag; /* rotate dump files after this many seconds */ + int ndo_Gflag_count; /* number of files created with Gflag rotation */ + time_t ndo_Gflag_time; /* The last time_t the dump file was rotated. */ int ndo_Wflag; /* recycle output files after this number of files */ - int ndo_WflagChars; + int ndo_WflagChars; + int ndo_Hflag; /* dissect 802.11s draft mesh standard */ + int ndo_suppress_default_print; /* don't use default_print() for unknown packet types */ const char *ndo_dltname; char *ndo_espsecret; struct sa_list *ndo_sa_list_head; /* used by print-esp.c */ struct sa_list *ndo_sa_default; - char *ndo_tcpmd5secret; /* TCP-MD5 secret key */ + char *ndo_sigsecret; /* Signature verification secret key */ struct esp_algorithm *ndo_espsecret_xform; /* cache of decoded */ char *ndo_espsecret_key; @@ -135,16 +148,26 @@ struct netdissect_options { /* pointer to void function to output stuff */ void (*ndo_default_print)(netdissect_options *, register const u_char *bp, register u_int length); - void (*ndo_default_print_unaligned)(netdissect_options *, - register const u_char *bp, register u_int length); void (*ndo_info)(netdissect_options *, int verbose); int (*ndo_printf)(netdissect_options *, - const char *fmt, ...); + const char *fmt, ...) +#ifdef __ATTRIBUTE___FORMAT_OK_FOR_FUNCTION_POINTERS + __attribute__ ((format (printf, 2, 3))) +#endif + ; void (*ndo_error)(netdissect_options *, - const char *fmt, ...); + const char *fmt, ...) +#ifdef __ATTRIBUTE___FORMAT_OK_FOR_FUNCTION_POINTERS + __attribute__ ((noreturn, format (printf, 2, 3))) +#endif + ; void (*ndo_warning)(netdissect_options *, - const char *fmt, ...); + const char *fmt, ...) +#ifdef __ATTRIBUTE___FORMAT_OK_FOR_FUNCTION_POINTERS + __attribute__ ((format (printf, 2, 3))) +#endif + ; }; #define PT_VAT 1 /* Visual Audio Tool */ @@ -162,22 +185,21 @@ struct netdissect_options { #define max(a,b) ((b)>(a)?(b):(a)) #endif -#ifndef INET6 /* - * The default snapshot length. This value allows most printers to print - * useful information while keeping the amount of unwanted data down. - * In particular, it allows for an ethernet header, tcp/ip header, and - * 14 bytes of data (assuming no ip options). + * Maximum snapshot length. This should be enough to capture the full + * packet on most network interfaces. + * + * XXX - could it be larger? If so, should it? Some applications might + * use the snapshot length in a savefile header to control the size of + * the buffer they allocate, so a size of, say, 2^31-1 might not work + * well. */ -#define DEFAULT_SNAPLEN 68 -#else -#define DEFAULT_SNAPLEN 96 -#endif +#define MAXIMUM_SNAPLEN 65535 -#ifndef BIG_ENDIAN -#define BIG_ENDIAN 4321 -#define LITTLE_ENDIAN 1234 -#endif +/* + * The default snapshot length is the maximum. + */ +#define DEFAULT_SNAPLEN MAXIMUM_SNAPLEN #define ESRC(ep) ((ep)->ether_shost) #define EDST(ep) ((ep)->ether_dhost) @@ -189,8 +211,16 @@ struct netdissect_options { #define HTONS(x) (x) = htons(x) #endif -/* True if "l" bytes of "var" were captured */ -#define ND_TTEST2(var, l) ((u_char *)&(var) <= ndo->ndo_snapend - (l)) +/* + * True if "l" bytes of "var" were captured. + * + * The "ndo->ndo_snapend - (l) <= ndo->ndo_snapend" checks to make sure + * "l" isn't so large that "ndo->ndo_snapend - (l)" underflows. + * + * The check is for <= rather than < because "l" might be 0. + */ +#define ND_TTEST2(var, l) (ndo->ndo_snapend - (l) <= ndo->ndo_snapend && \ + (const u_char *)&(var) <= ndo->ndo_snapend - (l)) /* True if "var" was captured */ #define ND_TTEST(var) ND_TTEST2(var, sizeof(var)) @@ -222,11 +252,13 @@ extern char *copy_argv(netdissect_options *, char **); #endif extern void safeputchar(int); -extern void safeputs(const char *); +extern void safeputs(const char *, int); + +#define PLURAL_SUFFIX(n) \ + (((n) != 1) ? "s" : "") #if 0 extern const char *isonsap_string(netdissect_options *, const u_char *); -extern const char *llcsap_string(netdissect_options *, u_char); extern const char *protoid_string(netdissect_options *, const u_char *); extern const char *dnname_string(netdissect_options *, u_short); extern const char *dnnum_string(netdissect_options *, u_short); @@ -236,23 +268,56 @@ extern const char *dnnum_string(netdissect_options *, u_short); #include +typedef u_int (*if_ndo_printer)(struct netdissect_options *ndo, + const struct pcap_pkthdr *, const u_char *); +typedef u_int (*if_printer)(const struct pcap_pkthdr *, const u_char *); -extern void eap_print(netdissect_options *,const u_char *, u_int); +extern if_ndo_printer lookup_ndo_printer(int); +extern if_printer lookup_printer(int); + +extern void eap_print(netdissect_options *,const u_char *, u_int); extern int esp_print(netdissect_options *, - register const u_char *bp, register const u_char *bp2, + register const u_char *bp, int len, register const u_char *bp2, int *nhdr, int *padlen); extern void arp_print(netdissect_options *,const u_char *, u_int, u_int); - +extern void icmp6_print(netdissect_options *ndo, const u_char *, + u_int, const u_char *, int); +extern void isakmp_print(netdissect_options *,const u_char *, + u_int, const u_char *); +extern void isakmp_rfc3948_print(netdissect_options *,const u_char *, + u_int, const u_char *); +extern void ip_print(netdissect_options *,const u_char *, u_int); +extern void ip_print_inner(netdissect_options *ndo, + const u_char *bp, u_int length, u_int nh, + const u_char *bp2); +extern void rrcp_print(netdissect_options *,const u_char *, u_int); + +extern void ether_print(netdissect_options *, + const u_char *, u_int, u_int, + void (*)(netdissect_options *, const u_char *), + const u_char *); + +extern u_int ether_if_print(netdissect_options *, + const struct pcap_pkthdr *,const u_char *); +extern u_int netanalyzer_if_print(netdissect_options *, + const struct pcap_pkthdr *,const u_char *); +extern u_int netanalyzer_transparent_if_print(netdissect_options *, + const struct pcap_pkthdr *, + const u_char *); + +extern int ethertype_print(netdissect_options *,u_short, const u_char *, + u_int, u_int); + +/* stuff that has not yet been rototiled */ #if 0 -extern void ascii_print_with_offset(netdissect_options *, const u_char *, - u_int, u_int); -extern void ascii_print(netdissect_options *,const u_char *, u_int); -extern void hex_print_with_offset(netdissect_options *,const u_char *, - u_int, u_int); -extern void telnet_print(netdissect_options *,const u_char *, u_int); -extern void hex_print(netdissect_options *,const u_char *, u_int); -extern int ether_encap_print(netdissect_options *,u_short, const u_char *, - u_int, u_int, u_short *); +extern void ascii_print(netdissect_options *,u_int); +extern void hex_and_ascii_print_with_offset(netdissect_options *,const char *, + u_int, u_int); +extern void hex_and_ascii_print(netdissect_options *,const char *, u_int); +extern void hex_print_with_offset(netdissect_options *,const char *, + u_int, u_int); +extern void hex_print(netdissect_options *,const char *, u_int); +extern void telnet_print(netdissect_options *,const u_char *, u_int); extern int llc_print(netdissect_options *, const u_char *, u_int, u_int, const u_char *, const u_char *, u_short *); @@ -274,14 +339,11 @@ extern void cnfp_print(netdissect_options *,const u_char *cp, extern void decnet_print(netdissect_options *,const u_char *, u_int, u_int); extern void default_print(netdissect_options *,const u_char *, u_int); -extern void default_print_unaligned(netdissect_options *,const u_char *, - u_int); extern void dvmrp_print(netdissect_options *,const u_char *, u_int); extern void egp_print(netdissect_options *,const u_char *, u_int, const u_char *); extern void arcnet_if_print(u_char*,const struct pcap_pkthdr *,const u_char *); -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 *); @@ -295,7 +357,7 @@ extern void igmp_print(netdissect_options *, register const u_char *, u_int); extern void igrp_print(netdissect_options *,const u_char *, u_int, const u_char *); -extern void ip_print(netdissect_options *,const u_char *, u_int); +extern int nextproto4_cksum(const struct ip *, const u_int8_t *, u_int, u_int); extern void ipN_print(netdissect_options *,const u_char *, u_int); extern void ipx_print(netdissect_options *,const u_char *, u_int); extern void isoclns_print(netdissect_options *,const u_char *, @@ -322,7 +384,7 @@ extern void ospf_print(netdissect_options *,const u_char *, u_int, const u_char *); extern void pimv1_print(netdissect_options *,const u_char *, u_int); extern void mobile_print(netdissect_options *,const u_char *, u_int); -extern void pim_print(netdissect_options *,const u_char *, u_int); +extern void pim_print(netdissect_options *,const u_char *, u_int, u_int); extern void pppoe_if_print(u_char *,const struct pcap_pkthdr *, const u_char *); extern void pppoe_print(netdissect_options *,const u_char *, u_int); extern void ppp_print(netdissect_options *, @@ -341,6 +403,7 @@ extern void raw_if_print(u_char *, const struct pcap_pkthdr *, const u_char *); extern void rip_print(netdissect_options *,const u_char *, u_int); +extern void rpki_rtr_print(netdissect_options *,const u_char *, u_int); extern void sctp_print(netdissect_options *ndo, const u_char *bp, const u_char *bp2, @@ -368,8 +431,6 @@ extern void wb_print(netdissect_options *,const void *, u_int); extern int ah_print(netdissect_options *,register const u_char *, register const u_char *); extern void esp_print_decodesecret(netdissect_options *ndo); -extern void isakmp_print(netdissect_options *,const u_char *, - u_int, const u_char *); extern int ipcomp_print(netdissect_options *,register const u_char *, register const u_char *, int *); extern void rx_print(netdissect_options *,register const u_char *, @@ -383,21 +444,32 @@ extern void nbt_udp137_print(netdissect_options *, extern void nbt_udp138_print(netdissect_options *, const u_char *data, int); extern char *smb_errstr(netdissect_options *,int, int); +extern const char *nt_errstr(netdissect_options *, u_int32_t); extern void print_data(netdissect_options *,const unsigned char *, int); extern void l2tp_print(netdissect_options *,const u_char *, u_int); extern void lcp_print(netdissect_options *,const u_char *, u_int); extern void vrrp_print(netdissect_options *,const u_char *bp, u_int len, int ttl); +extern void carp_print(netdissect_options *,const u_char *bp, + u_int len, int ttl); extern void cdp_print(netdissect_options *,const u_char *, u_int, u_int, const u_char *, const u_char *); extern void stp_print(netdissect_options *,const u_char *p, u_int length); extern void radius_print(netdissect_options *,const u_char *, u_int); extern void lwres_print(netdissect_options *,const u_char *, u_int); extern void pptp_print(netdissect_options *,const u_char *, u_int); +#endif + +extern u_int ipnet_if_print(netdissect_options *,const struct pcap_pkthdr *, const u_char *); +extern u_int ppi_if_print(netdissect_options *,const struct pcap_pkthdr *, const u_char *); + +extern u_int ieee802_15_4_if_print(netdissect_options *,const struct pcap_pkthdr *, const u_char *); #ifdef INET6 extern void ip6_print(netdissect_options *,const u_char *, u_int); +#if 0 extern void ip6_opt_print(netdissect_options *,const u_char *, int); +extern int nextproto6_cksum(const struct ip6_hdr *, const u_int8_t *, u_int, u_int); extern int hbhopt_print(netdissect_options *,const u_char *); extern int dstopt_print(netdissect_options *,const u_char *); extern int frag6_print(netdissect_options *,const u_char *, @@ -412,11 +484,24 @@ extern void dhcp6_print(netdissect_options *,const u_char *, extern void zephyr_print(netdissect_options * ndo, const u_char *cp, int length); +#endif /* 0 */ #endif /*INET6*/ -extern u_short in_cksum(const u_short *, - register u_int, int); +#if 0 +struct cksum_vec { + const u_int8_t *ptr; + int len; +}; +extern u_int16_t in_cksum(const struct cksum_vec *, int); +extern u_int16_t in_cksum_shouldbe(u_int16_t, u_int16_t); #endif +extern void esp_print_decodesecret(netdissect_options *ndo); +extern int esp_print_decrypt_buffer_by_ikev2(netdissect_options *ndo, + int initiator, + u_char spii[8], u_char spir[8], + u_char *buf, u_char *end); + + #endif /* netdissect_h */