X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/b30f3843b93c11e897e6d8888a91abf709a716ae..d9a787e4995b4b5101e410ed1e93367907ab9fe2:/netdissect.h diff --git a/netdissect.h b/netdissect.h index d73d3f78..96b6c0e7 100644 --- a/netdissect.h +++ b/netdissect.h @@ -99,7 +99,7 @@ typedef unsigned char nd_ipv6[16]; /* * Use this for MAC addresses. */ -#define MAC_ADDR_LEN 6 /* length of MAC addresses */ +#define MAC_ADDR_LEN 6U /* length of MAC addresses */ typedef unsigned char nd_mac_addr[MAC_ADDR_LEN]; /* @@ -194,6 +194,9 @@ struct netdissect_saved_packet_info { struct netdissect_saved_packet_info *ndspi_prev; /* previous buffer on the stack */ }; +/* 'val' value(s) for longjmp */ +#define ND_TRUNCATED 1 + struct netdissect_options { int ndo_bflag; /* print 4 byte ASes in ASDOT notation */ int ndo_eflag; /* print ethernet header */ @@ -213,7 +216,7 @@ struct netdissect_options { */ int ndo_Hflag; /* dissect 802.11s draft mesh standard */ const char *ndo_protocol; /* protocol */ - jmp_buf ndo_truncated; /* jmp_buf for setjmp()/longjmp() */ + jmp_buf ndo_early_end; /* jmp_buf for setjmp()/longjmp() */ 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 */ @@ -288,12 +291,8 @@ extern void nd_pop_all_packet_info(netdissect_options *); #define PT_SOMEIP 19 /* Autosar SOME/IP Protocol */ #define PT_DOMAIN 20 /* Domain Name System (DNS) */ -#ifndef min -#define min(a,b) ((a)>(b)?(b):(a)) -#endif -#ifndef max -#define max(a,b) ((b)>(a)?(b):(a)) -#endif +#define ND_MIN(a,b) ((a)>(b)?(b):(a)) +#define ND_MAX(a,b) ((b)>(a)?(b):(a)) /* For source or destination ports tests (UDP, TCP, ...) */ #define IS_SRC_OR_DST_PORT(p) (sport == (p) || dport == (p)) @@ -363,7 +362,11 @@ extern void nd_pop_all_packet_info(netdissect_options *); #define ND_TTEST_SIZE(p) ND_TTEST_LEN(p, sizeof(*(p))) /* Bail out if "l" bytes from "p" were not captured */ +#ifdef ND_LONGJMP_FROM_TCHECK +#define ND_TCHECK_LEN(p, l) if (!ND_TTEST_LEN(p, l)) nd_trunc_longjmp(ndo) +#else #define ND_TCHECK_LEN(p, l) if (!ND_TTEST_LEN(p, l)) goto trunc +#endif /* Bail out if "*(p)" was not captured */ #define ND_TCHECK_SIZE(p) ND_TCHECK_LEN(p, sizeof(*(p))) @@ -388,10 +391,10 @@ extern void unsigned_relts_print(netdissect_options *, uint32_t); extern void fn_print_char(netdissect_options *, 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 *, 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 *); +extern void nd_printjn(netdissect_options *, const u_char *, u_int); +extern void nd_printjnp(netdissect_options *, const u_char *, u_int); /* * Flags for txtproto_print(). @@ -448,9 +451,18 @@ extern int unaligned_memcmp(const void *, const void *, size_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) +struct uint_tokary +{ + u_int uintval; + const struct tok *tokary; +}; + +extern const struct tok *uint2tokary_internal(const struct uint_tokary[], const size_t, const u_int); +#define uint2tokary(a, i) uint2tokary_internal(a, sizeof(a)/sizeof(a[0]), i) + extern if_printer lookup_printer(int); -#define ND_DEBUG {printf(" [%s:%d %s] ", __FILE__, __LINE__, __FUNCTION__); fflush(stdout);} +#define ND_DEBUG {printf(" [%s:%d %s] ", __FILE__, __LINE__, __func__); fflush(stdout);} /* The DLT printer routines */ @@ -538,7 +550,7 @@ struct lladdr_info { extern void aarp_print(netdissect_options *, const u_char *, u_int); extern int ah_print(netdissect_options *, const u_char *); -extern void ahcp_print(netdissect_options *, const u_char *, const u_int); +extern void ahcp_print(netdissect_options *, const u_char *, u_int); extern void aodv_print(netdissect_options *, const u_char *, u_int, int); extern void aoe_print(netdissect_options *, const u_char *, const u_int); extern int arista_ethertype_print(netdissect_options *,const u_char *, u_int); @@ -555,7 +567,7 @@ 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); -extern void cdp_print(netdissect_options *, const u_char *, u_int, u_int); +extern void cdp_print(netdissect_options *, const u_char *, u_int); extern void cfm_print(netdissect_options *, const u_char *, u_int); extern u_int chdlc_print(netdissect_options *, const u_char *, u_int); extern void cisco_autorp_print(netdissect_options *, const u_char *, u_int); @@ -613,7 +625,7 @@ extern u_int llap_print(netdissect_options *, const u_char *, u_int); extern int llc_print(netdissect_options *, const u_char *, u_int, u_int, const struct lladdr_info *, const struct lladdr_info *); extern void lldp_print(netdissect_options *, const u_char *, u_int); extern void lmp_print(netdissect_options *, const u_char *, u_int); -extern void loopback_print(netdissect_options *, const u_char *, const u_int); +extern void loopback_print(netdissect_options *, const u_char *, u_int); extern void lspping_print(netdissect_options *, const u_char *, u_int); extern void lwapp_control_print(netdissect_options *, const u_char *, u_int, int); extern void lwapp_data_print(netdissect_options *, const u_char *, u_int); @@ -643,7 +655,7 @@ extern void nsh_print(netdissect_options *, const u_char *, u_int); extern void ntp_print(netdissect_options *, const u_char *, u_int); extern void oam_print(netdissect_options *, const u_char *, u_int, u_int); 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 openflow_print(netdissect_options *, const u_char *, 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_grace_lsa_print(netdissect_options *, const u_char *, u_int); @@ -668,7 +680,7 @@ extern void rrcp_print(netdissect_options *, const u_char *, u_int, const struct extern void rsvp_print(netdissect_options *, const u_char *, u_int); extern int rt6_print(netdissect_options *, const u_char *, const u_char *); extern void rtsp_print(netdissect_options *, const u_char *, u_int); -extern void rx_print(netdissect_options *, const u_char *, u_int, u_int, u_int, const u_char *); +extern void rx_print(netdissect_options *, const u_char *, u_int, uint16_t, uint16_t, const u_char *); extern void sctp_print(netdissect_options *, const u_char *, const u_char *, u_int); extern void sflow_print(netdissect_options *, const u_char *, u_int); extern void ssh_print(netdissect_options *, const u_char *, u_int);