X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/bd00116d80c18b782f4cb15dfc90cd5bf993d4f5..0845bc813c1cc48b18cdefff0b387c110647463c:/netdissect.h diff --git a/netdissect.h b/netdissect.h index f4de98cd..458732b8 100644 --- a/netdissect.h +++ b/netdissect.h @@ -54,7 +54,7 @@ int vsnprintf (char *str, size_t sz, const char *format, va_list ap) __attribute__((format (printf, 3, 0))) #endif /* __ATTRIBUTE___FORMAT_OK */ ; -#endif /* !defined(HAVE_SNPRINTF) */ +#endif /* !defined(HAVE_VSNPRINTF) */ #ifndef HAVE_STRLCAT extern size_t strlcat (char *, const char *, size_t); @@ -76,20 +76,17 @@ struct tok { const char *s; /* string */ }; -#define TOKBUFSIZE 128 extern const char *tok2strbuf(const struct tok *, const char *, u_int, char *buf, size_t bufsize); /* 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); - +extern const char *tok2str(const struct tok *, const char *, u_int); +extern char *bittok2str(const struct tok *, const char *, u_int); +extern char *bittok2str_nosep(const struct tok *, const char *, u_int); typedef struct netdissect_options netdissect_options; struct netdissect_options { - int ndo_aflag; /* translate network and broadcast addresses */ 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 */ @@ -101,7 +98,6 @@ struct netdissect_options { int ndo_sflag; /* use the libsmi to translate OIDs */ int ndo_Sflag; /* print raw TCP sequence numbers */ int ndo_tflag; /* print packet arrival time */ - int ndo_Uflag; /* "unbuffered" output of dump files */ int ndo_uflag; /* Print undecoded NFS handles */ int ndo_vflag; /* verbose */ int ndo_xflag; /* print packet in hex */ @@ -109,57 +105,33 @@ 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_immediate; /* use immediate mode */ - 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_Hflag; /* dissect 802.11s draft mesh standard */ int ndo_packet_number; /* print a packet number in the beginning of line */ int ndo_suppress_default_print; /* don't use default_print() for unknown packet types */ - int ndo_tstamp_precision; /* requested time stamp precision */ + int ndo_tstamp_precision; /* requested time stamp precision */ const char *ndo_dltname; + const char *program_name; /* Name of the program using the library */ char *ndo_espsecret; struct sa_list *ndo_sa_list_head; /* used by print-esp.c */ struct sa_list *ndo_sa_default; - char *ndo_sigsecret; /* Signature verification secret key */ - - struct esp_algorithm *ndo_espsecret_xform; /* cache of decoded */ - char *ndo_espsecret_key; + char *ndo_sigsecret; /* Signature verification secret key */ int ndo_packettype; /* as specified by -T */ - char *ndo_program_name; /*used to generate self-identifying messages */ - - int32_t ndo_thiszone; /* seconds offset from gmt to local time */ - int ndo_snaplen; /*global pointers to beginning and end of current packet (during printing) */ const u_char *ndo_packetp; const u_char *ndo_snapend; - /* bookkeeping for ^T output */ - int ndo_infodelay; - /* pointer to void function to output stuff */ void (*ndo_default_print)(netdissect_options *, - register const u_char *bp, register u_int length); - - /* pointer to function to print ^T output */ - void (*ndo_info)(netdissect_options *, int verbose); + register const u_char *bp, register u_int length); /* pointer to function to do regular output */ int (*ndo_printf)(netdissect_options *, @@ -270,8 +242,16 @@ struct netdissect_options { * * http://www.kb.cert.org/vuls/id/162289 */ + +/* + * Test in two parts to avoid these warnings: + * comparison of unsigned expression >= 0 is always true [-Wtype-limits], + * comparison is always true due to limited range of data type [-Wtype-limits]. + */ +#define IS_NOT_NEGATIVE(x) (((x) > 0) || ((x) == 0)) + #define ND_TTEST2(var, l) \ - ((l) >= 0 && \ + (IS_NOT_NEGATIVE(l) && \ ((uintptr_t)ndo->ndo_snapend - (l) <= (uintptr_t)ndo->ndo_snapend && \ (uintptr_t)&(var) <= (uintptr_t)ndo->ndo_snapend - (l))) @@ -293,7 +273,6 @@ extern void relts_print(netdissect_options *, int); extern int fn_print(netdissect_options *, const u_char *, const u_char *); extern int fn_printn(netdissect_options *, const u_char *, u_int, const u_char *); extern int fn_printzp(netdissect_options *, const u_char *, u_int, const u_char *); -extern const char *tok2str(const struct tok *, const char *, int); /* * Flags for txtproto_print(). @@ -303,11 +282,6 @@ extern const char *tok2str(const struct tok *, const char *, int); extern void txtproto_print(netdissect_options *, const u_char *, u_int, const char *, const char **, u_int); -#if 0 -extern char *read_infile(netdissect_options *, char *); -extern char *copy_argv(netdissect_options *, char **); -#endif - /* * Locale-independent macros for testing character properties and * stripping the 8th bit from characters. Assumed to be handed @@ -350,10 +324,16 @@ extern int unaligned_memcmp(const void *, const void *, size_t); #define PLURAL_SUFFIX(n) \ (((n) != 1) ? "s" : "") -#if 0 extern const char *dnname_string(netdissect_options *, u_short); extern const char *dnnum_string(netdissect_options *, u_short); -#endif + +extern int mask2plen(uint32_t); +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) + +#ifdef INET6 +extern int mask62plen(const u_char *); +#endif /*INET6*/ /* The printer routines. */ @@ -371,6 +351,7 @@ extern int esp_print(netdissect_options *, const u_char *bp, const int length, const u_char *bp2, int *nhdr, int *padlen); extern void arp_print(netdissect_options *,const u_char *, u_int, u_int); +extern void medsa_print(netdissect_options *, const u_char *, u_int, u_int); extern void tipc_print(netdissect_options *, const u_char *, u_int, u_int); extern void msnlb_print(netdissect_options *, const u_char *); extern void icmp6_print(netdissect_options *ndo, const u_char *, @@ -503,7 +484,7 @@ extern void tftp_print(netdissect_options *, const u_char *, u_int); extern void vrrp_print(netdissect_options *, const u_char *, u_int, const u_char *, int); extern void pimv1_print(netdissect_options *, const u_char *, u_int); extern void cisco_autorp_print(netdissect_options *, const u_char *, u_int); -extern void pim_print(netdissect_options *, const u_char *, u_int, u_int); +extern void pim_print(netdissect_options *, const u_char *, u_int, const u_char *); extern const u_char * ns_nprint (netdissect_options *, register const u_char *, register const u_char *); extern void ns_print(netdissect_options *, const u_char *, u_int, int); extern void bootp_print(netdissect_options *, const u_char *, u_int); @@ -538,7 +519,7 @@ extern u_int juniper_ppp_print(netdissect_options *, const struct pcap_pkthdr *, extern u_int juniper_frelay_print(netdissect_options *, const struct pcap_pkthdr *, const u_char *); extern u_int juniper_chdlc_print(netdissect_options *, const struct pcap_pkthdr *, const u_char *); extern void snmp_print(netdissect_options *, const u_char *, u_int); -extern void rx_print(netdissect_options *, register const u_char *, int, int, int, u_char *); +extern void rx_print(netdissect_options *, register const u_char *, int, int, int, const u_char *); extern void nfsreply_print(netdissect_options *, const u_char *, u_int, const u_char *); extern void nfsreply_print_noaddr(netdissect_options *, const u_char *, u_int, const u_char *); extern void nfsreq_print_noaddr(netdissect_options *, const u_char *, u_int, const u_char *); @@ -575,12 +556,8 @@ extern void geneve_print(netdissect_options *, const u_char *, u_int); /* stuff that has not yet been rototiled */ -#if 0 -extern void ascii_print(netdissect_options *,u_int); -extern void default_print(netdissect_options *,const u_char *, u_int); -extern char *smb_errstr(netdissect_options *,int, int); -extern const char *nt_errstr(netdissect_options *, uint32_t); -#endif +extern char *smb_errstr(int, int); +extern const char *nt_errstr(uint32_t); 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 *); @@ -605,14 +582,18 @@ extern void ospf6_print(netdissect_options *, const u_char *, u_int); extern void babel_print(netdissect_options *, const u_char *, u_int); #endif /*INET6*/ -#if 0 +/* checksum routines */ +extern void init_checksum(void); +extern uint16_t verify_crc10_cksum(uint16_t, const u_char *, int); +extern uint16_t create_osi_cksum(const uint8_t *, int, int); + struct cksum_vec { const uint8_t *ptr; int len; }; extern uint16_t in_cksum(const struct cksum_vec *, int); extern uint16_t in_cksum_shouldbe(uint16_t, uint16_t); -#endif + extern int nextproto4_cksum(netdissect_options *ndo, const struct ip *, const uint8_t *, u_int, u_int, u_int); extern int decode_prefix4(netdissect_options *ndo, const u_char *, u_int, char *, u_int); #ifdef INET6 @@ -623,12 +604,10 @@ 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); + const u_char *buf, const u_char *end); extern void geonet_print(netdissect_options *ndo,const u_char *eth_hdr,const u_char *geo_pck, u_int len); extern void calm_fast_print(netdissect_options *ndo,const u_char *eth_hdr,const u_char *calm_pck, u_int len); -extern netdissect_options *gndo; - #endif /* netdissect_h */