X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/2122c3a243089426fb4a31733f2abf78d3ba941a..a63600a1fc28dbc7ae7ce9f996829c49a25fb33c:/netdissect.h diff --git a/netdissect.h b/netdissect.h index 867be794..4f917eeb 100644 --- a/netdissect.h +++ b/netdissect.h @@ -30,8 +30,10 @@ #endif #include #include +#include #include "status-exit-codes.h" #include "funcattrs.h" /* for PRINTFLIKE_FUNCPTR() */ +#include "diag-control.h" /* for ND_UNREACHABLE */ /* * Data types corresponding to multi-byte integral values within data @@ -128,10 +130,6 @@ extern size_t strlcat (char *, const char *, size_t); extern size_t strlcpy (char *, const char *, size_t); #endif -#ifndef HAVE_STRDUP -extern char *strdup (const char *str); -#endif - #ifndef HAVE_STRSEP extern char *strsep(char **, const char *); #endif @@ -176,7 +174,7 @@ typedef void (*if_printer) IF_PRINTER_ARGS; * buffer, we free the current buffer and pop the previous one off the * stack. * - * A buffer has a beginnning and end pointer, and a link to the previous + * A buffer has a beginning and end pointer, and a link to the previous * buffer on the stack. * * In other cases, we temporarily adjust the snapshot end to reflect a @@ -262,13 +260,26 @@ struct netdissect_options { PRINTFLIKE_FUNCPTR(2, 3); }; -extern int nd_push_buffer(netdissect_options *, u_char *, const u_char *, - const u_char *); -extern int nd_push_snapend(netdissect_options *, const u_char *); -extern void nd_change_snapend(netdissect_options *, const u_char *); +extern WARN_UNUSED_RESULT int nd_push_buffer(netdissect_options *, u_char *, const u_char *, const u_int); +extern WARN_UNUSED_RESULT int nd_push_snaplen(netdissect_options *, const u_char *, const u_int); +extern void nd_change_snaplen(netdissect_options *, const u_char *, const u_int); extern void nd_pop_packet_info(netdissect_options *); extern void nd_pop_all_packet_info(netdissect_options *); +static inline NORETURN void +nd_trunc_longjmp(netdissect_options *ndo) +{ + longjmp(ndo->ndo_early_end, ND_TRUNCATED); +#ifdef _AIX + /* + * In AIX decorates longjmp() with "#pragma leaves", which tells + * XL C that the function is noreturn, but GCC remains unaware of that and + * yields a "'noreturn' function does return" warning. + */ + ND_UNREACHABLE +#endif /* _AIX */ +} + #define PT_VAT 1 /* Visual Audio Tool */ #define PT_WB 2 /* distributed White Board */ #define PT_RPC 3 /* Remote Procedure Call */ @@ -423,6 +434,9 @@ extern void ts_print(netdissect_options *, const struct timeval *); extern void signed_relts_print(netdissect_options *, int32_t); extern void unsigned_relts_print(netdissect_options *, uint32_t); +extern const char *nd_format_time(char *buf, size_t bufsize, + const char *format, const struct tm *timeptr); + extern void fn_print_char(netdissect_options *, u_char); extern void fn_print_str(netdissect_options *, const u_char *); extern u_int nd_printztn(netdissect_options *, const u_char *, u_int, const u_char *); @@ -445,7 +459,7 @@ extern void txtproto_print(netdissect_options *, const u_char *, u_int, (defined(__s390__) || defined(__s390x__) || defined(__zarch__)) || \ defined(__vax__) /* - * The procesor natively handles unaligned loads, so just use memcpy() + * The processor natively handles unaligned loads, so just use memcpy() * and memcmp(), to enable those optimizations. * * XXX - are those all the x86 tests we need? @@ -603,7 +617,7 @@ extern void calm_fast_print(netdissect_options *, const u_char *, u_int, const s extern void carp_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 chdlc_print(netdissect_options *, const u_char *, u_int); extern void cisco_autorp_print(netdissect_options *, const u_char *, u_int); extern void cnfp_print(netdissect_options *, const u_char *); extern void dccp_print(netdissect_options *, const u_char *, const u_char *, u_int); @@ -617,6 +631,7 @@ extern void eap_print(netdissect_options *, const u_char *, u_int); extern void eapol_print(netdissect_options *, const u_char *); extern void egp_print(netdissect_options *, const u_char *, u_int); extern void eigrp_print(netdissect_options *, const u_char *, u_int); +extern void erspan_print(netdissect_options *, uint16_t, const u_char *, u_int); extern void esp_print(netdissect_options *, const u_char *, u_int, const u_char *, u_int, int, u_int); extern u_int ether_print(netdissect_options *, const u_char *, u_int, u_int, void (*)(netdissect_options *, const u_char *), const u_char *); extern u_int ether_switch_tag_print(netdissect_options *, const u_char *, u_int, u_int, void (*)(netdissect_options *, const u_char *), u_int); @@ -683,6 +698,7 @@ extern void netbeui_print(netdissect_options *, u_short, const u_char *, u_int); extern void nfsreply_noaddr_print(netdissect_options *, const u_char *, u_int, const u_char *); extern void nfsreply_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 void nhrp_print(netdissect_options *, const u_char *, u_int); 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); @@ -750,7 +766,6 @@ extern void zmtp1_datagram_print(netdissect_options *, const u_char *, const u_i extern void zmtp1_print(netdissect_options *, const u_char *, u_int); /* 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);