X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/a909db55ebc50de487e65f19b3250d0b45763d2d..a8abce5c5e2dce2ba6dbccd5d3829da104b80f9c:/netdissect.h diff --git a/netdissect.h b/netdissect.h index 323343dc..93fa8be6 100644 --- a/netdissect.h +++ b/netdissect.h @@ -29,55 +29,7 @@ #include "os-proto.h" #endif #include - -/* - * Used to declare a structure unaligned, so that the C compiler, - * if necessary, generates code that doesn't assume alignment. - * This is required because there is no guarantee that the packet - * data we get from libpcap/WinPcap is properly aligned. - * - * This assumes that, for all compilers that support __attribute__((packed)), - * for all instruction set architectures requiring strict alignment, declaring - * a structure with that attribute causes the compiler to generate code that - * handles misaligned 2-byte, 4-byte, and 8-byte integral quantities. - * - * It does not (yet) handle compilers where you can get the compiler - * to generate code of that sort by some other means. - * - * This is required in order to, for example, keep the compiler from - * generating, for - * - * if (bp->bp_htype == 1 && bp->bp_hlen == 6 && bp->bp_op == BOOTPREQUEST) { - * - * in print-bootp.c, code that loads the first 4-byte word of a - * "struct bootp", masking out the bp_hops field, and comparing the result - * against 0x01010600. - * - * Note: this also requires that padding be put into the structure, - * at least for compilers where it's implemented as __attribute__((packed)). - * - * XXX - now that we're using nd_ types that are just arrays of bytes, is - * this still necessary? Are there any compilers that align structures, - * none of whose members require more than byte alignment, on more than - * one-byte boundaries, and assume a structure is aligned on such a - * boundary? (I have vague memories of either m68k or ARM compilers - * aligning on at least 2-byte boundaries.) - */ -#if ND_IS_AT_LEAST_GNUC_VERSION(2,0) || \ - ND_IS_AT_LEAST_XL_C_VERSION(6,0) - /* - * GCC 2.0 or later, or a compiler that claims to be GCC 2.0 or later, - * or IBM XL C 6.0 or later. - * - * Use __attribute__((packed)). - */ - #define ND_UNALIGNED __attribute__((packed)) -#else - /* - * Nothing. - */ - #define ND_UNALIGNED -#endif +#include "status-exit-codes.h" /* * Data types corresponding to multi-byte integral values within data @@ -152,7 +104,14 @@ typedef unsigned char nd_mac_addr[MAC_ADDR_LEN]; */ typedef unsigned char nd_byte; -/* snprintf et al */ +/* + * Round up x to a multiple of y; y must be a power of 2. + */ +#ifndef roundup2 +#define roundup2(x, y) (((x)+((y)-1))&(~((y)-1))) +#endif + +/* nd_snprintf et al */ #include #include @@ -164,16 +123,6 @@ extern int32_t thiszone; /* seconds offset from gmt to local time */ /* invalid string to print '(invalid)' for malformed or corrupted packets */ extern const char istr[]; -#if !defined(HAVE_SNPRINTF) -int snprintf (char *str, size_t sz, FORMAT_STRING(const char *format), ...) - PRINTFLIKE(3, 4); -#endif /* !defined(HAVE_SNPRINTF) */ - -#if !defined(HAVE_VSNPRINTF) -int vsnprintf (char *str, size_t sz, FORMAT_STRING(const char *format), - va_list ap) PRINTFLIKE(3, 0); -#endif /* !defined(HAVE_VSNPRINTF) */ - #ifndef HAVE_STRLCAT extern size_t strlcat (char *, const char *, size_t); #endif @@ -240,6 +189,8 @@ struct netdissect_options { * LF, CR and SPACE as graphical chars */ int ndo_Hflag; /* dissect 802.11s draft mesh standard */ + const char *ndo_protocol; /* protocol */ + void *ndo_last_mem_p; /* pointer to the last allocated memory chunk */ 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 */ @@ -272,8 +223,9 @@ struct netdissect_options { PRINTFLIKE_FUNCPTR(2, 3); /* pointer to function to output errors */ void NORETURN_FUNCPTR (*ndo_error)(netdissect_options *, + status_exit_codes_t status, const char *fmt, ...) - PRINTFLIKE_FUNCPTR(2, 3); + PRINTFLIKE_FUNCPTR(3, 4); /* pointer to function to output warnings */ void (*ndo_warning)(netdissect_options *, const char *fmt, ...) @@ -386,10 +338,11 @@ extern void signed_relts_print(netdissect_options *, int32_t); extern void unsigned_relts_print(netdissect_options *, uint32_t); extern void fn_print_char(netdissect_options *, u_char); -extern int fn_print(netdissect_options *, const u_char *, const u_char *); -extern u_int fn_printztn(netdissect_options *ndo, const u_char *, u_int, 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 void fn_print_str(netdissect_options *, const u_char *); +extern int nd_print(netdissect_options *, const u_char *, const u_char *); +extern u_int nd_printztn(netdissect_options *ndo, const u_char *, u_int, const u_char *); +extern int nd_printn(netdissect_options *, const u_char *, u_int, const u_char *); +extern int nd_printzp(netdissect_options *, const u_char *, u_int, const u_char *); /* * Flags for txtproto_print(). @@ -410,9 +363,6 @@ extern void txtproto_print(netdissect_options *, const u_char *, u_int, #define ND_ISGRAPH(c) ((c) > 0x20 && (c) <= 0x7E) #define ND_TOASCII(c) ((c) & 0x7F) -extern void safeputchar(netdissect_options *, const u_char); -extern void safeputs(netdissect_options *, const u_char *, const u_int); - #if (defined(__i386__) || defined(_M_IX86) || defined(__X86__) || defined(__x86_64__) || defined(_M_X64)) || \ (defined(__arm__) || defined(_M_ARM) || defined(__aarch64__)) || \ (defined(__m68k__) && (!defined(__mc68000__) && !defined(__mc68010__))) || \ @@ -515,6 +465,7 @@ extern u_int raw_if_print IF_PRINTER_ARGS; extern u_int sl_bsdos_if_print IF_PRINTER_ARGS; extern u_int sl_if_print IF_PRINTER_ARGS; extern u_int sll_if_print IF_PRINTER_ARGS; +extern u_int sll2_if_print IF_PRINTER_ARGS; extern u_int sunatm_if_print IF_PRINTER_ARGS; extern u_int symantec_if_print IF_PRINTER_ARGS; extern u_int token_if_print IF_PRINTER_ARGS; @@ -551,7 +502,7 @@ extern void babel_print(netdissect_options *, const u_char *, u_int); extern void beep_print(netdissect_options *, const u_char *, u_int); extern void bfd_print(netdissect_options *, const u_char *, u_int, u_int); extern void bgp_print(netdissect_options *, const u_char *, u_int); -extern char *bgp_vpn_rd_print (netdissect_options *, const u_char *); +extern const char *bgp_vpn_rd_print(netdissect_options *, const u_char *); extern void bootp_print(netdissect_options *, const u_char *, u_int); extern void calm_fast_print(netdissect_options *, const u_char *, u_int, const struct lladdr_info *); extern void carp_print(netdissect_options *, const u_char *, u_int, u_int); @@ -582,7 +533,6 @@ extern void geonet_print(netdissect_options *, const u_char *, u_int, const stru extern void gre_print(netdissect_options *, const u_char *, u_int); extern int hbhopt_print(netdissect_options *, const u_char *); extern void hex_and_ascii_print(netdissect_options *, const char *, const u_char *, u_int); -extern void hex_and_ascii_print_with_offset(netdissect_options *, const char *, const u_char *, u_int, u_int); extern void hex_print(netdissect_options *, const char *ident, const u_char *cp, u_int); extern void hex_print_with_offset(netdissect_options *, const char *ident, const u_char *cp, u_int, u_int); extern void hncp_print(netdissect_options *, const u_char *, u_int); @@ -595,7 +545,7 @@ extern void igrp_print(netdissect_options *, const u_char *, u_int); extern void ip6_print(netdissect_options *, const u_char *, u_int); extern void ipN_print(netdissect_options *, const u_char *, u_int); extern void ip_print(netdissect_options *, const u_char *, u_int); -extern void ip_print_inner(netdissect_options *, const u_char *, u_int, u_int nh, const u_char *); +extern void ip_inner_print(netdissect_options *, const u_char *, u_int, u_int nh, const u_char *); extern void ipcomp_print(netdissect_options *, const u_char *); extern void ipx_netbios_print(netdissect_options *, const u_char *, u_int); extern void ipx_print(netdissect_options *, const u_char *, u_int); @@ -633,7 +583,7 @@ extern void netbeui_print(netdissect_options *, u_short, const u_char *, u_int); extern void nfsreply_print(netdissect_options *, const u_char *, u_int, const u_char *); extern void nfsreply_noaddr_print(netdissect_options *, const u_char *, u_int, const u_char *); extern void nfsreq_noaddr_print(netdissect_options *, const u_char *, u_int, const u_char *); -extern const u_char * ns_nprint (netdissect_options *, const u_char *, const u_char *); +extern const u_char * ns_nprint(netdissect_options *, const u_char *, const u_char *); extern void domain_print(netdissect_options *, const u_char *, u_int, int); extern void nsh_print(netdissect_options *ndo, const u_char *bp, u_int len); extern void ntp_print(netdissect_options *, const u_char *, u_int); @@ -642,8 +592,8 @@ extern void olsr_print(netdissect_options *, const u_char *, u_int, int); extern void openflow_print(netdissect_options *, const u_char *, const u_int); extern void ospf6_print(netdissect_options *, const u_char *, u_int); extern void ospf_print(netdissect_options *, const u_char *, u_int, const u_char *); -extern int ospf_print_grace_lsa(netdissect_options *, const u_char *, u_int); -extern int ospf_print_te_lsa(netdissect_options *, const u_char *, u_int); +extern int ospf_grace_lsa_print(netdissect_options *, const u_char *, u_int); +extern int ospf_te_lsa_print(netdissect_options *, const u_char *, u_int); extern void otv_print(netdissect_options *, const u_char *, u_int); extern void pgm_print(netdissect_options *, const u_char *, u_int, const u_char *); extern void pim_print(netdissect_options *, const u_char *, u_int, const u_char *); @@ -652,7 +602,7 @@ extern u_int ppp_print(netdissect_options *, const u_char *, u_int); extern u_int pppoe_print(netdissect_options *, const u_char *, u_int); extern void pptp_print(netdissect_options *, const u_char *); extern int print_unknown_data(netdissect_options *, const u_char *, const char *, int); -extern char *q922_string(netdissect_options *, const u_char *, u_int); +extern const char *q922_string(netdissect_options *, const u_char *, u_int); extern void q933_print(netdissect_options *, const u_char *, u_int); extern void radius_print(netdissect_options *, const u_char *, u_int); extern void resp_print(netdissect_options *, const u_char *, u_int); @@ -668,7 +618,7 @@ extern void sctp_print(netdissect_options *, const u_char *, const u_char *, u_i extern void sflow_print(netdissect_options *, const u_char *, u_int); extern void sip_print(netdissect_options *, const u_char *, u_int); extern void slow_print(netdissect_options *, const u_char *, u_int); -extern void smb_print_data(netdissect_options *, const u_char *, u_int); +extern void smb_data_print(netdissect_options *, const u_char *, u_int); extern void smb_tcp_print(netdissect_options *, const u_char *, u_int); extern void smtp_print(netdissect_options *, const u_char *, u_int); extern int snap_print(netdissect_options *, const u_char *, u_int, u_int, const struct lladdr_info *, const struct lladdr_info *, u_int); @@ -713,15 +663,14 @@ extern int nextproto4_cksum(netdissect_options *, const struct ip *, const uint8 extern int nextproto6_cksum(netdissect_options *, const struct ip6_hdr *, const uint8_t *, u_int, u_int, u_int); /* Utilities */ +extern void nd_print_trunc(netdissect_options *); + extern int mask2plen(uint32_t); extern int mask62plen(const u_char *); extern const char *dnname_string(netdissect_options *, u_short); extern const char *dnnum_string(netdissect_options *, u_short); -extern char *smb_errstr(int, int); -extern const char *nt_errstr(uint32_t); - extern int decode_prefix4(netdissect_options *, const u_char *, u_int, char *, u_int); extern int decode_prefix6(netdissect_options *, const u_char *, u_int, char *, u_int);