X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/96c60029b3f935eff892d1f49b52f305423e4671..afe133ecef9a8593ecf7fcbb557276c05f2bc7ab:/netdissect.h diff --git a/netdissect.h b/netdissect.h index f2e45700..b744fe87 100644 --- a/netdissect.h +++ b/netdissect.h @@ -30,7 +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 @@ -61,6 +64,8 @@ typedef signed char nd_int8_t[1]; typedef unsigned char nd_int32_t[4]; typedef unsigned char nd_int64_t[8]; +#define FMAXINT (4294967296.0) /* floating point rep. of MAXINT */ + /* * Use this for IPv4 addresses and netmasks. * @@ -97,7 +102,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]; /* @@ -125,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 @@ -138,9 +139,6 @@ struct tok { const char *s; /* string */ }; -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 *, u_int); extern char *bittok2str(const struct tok *, const char *, u_int); @@ -164,15 +162,7 @@ typedef struct netdissect_options netdissect_options; #define IF_PRINTER_ARGS (netdissect_options *, const struct pcap_pkthdr *, const u_char *) -typedef u_int (*uint_if_printer) IF_PRINTER_ARGS; -typedef void (*void_if_printer) IF_PRINTER_ARGS; - -/* pointer to the uint_if_printer or the void_if_printer function */ -typedef union { - uint_if_printer uint_printer; - void_if_printer void_printer; - void* printer; /* generic when testing if NULL or not */ -} if_printer_t; +typedef void (*if_printer) IF_PRINTER_ARGS; /* * In case the data in a buffer needs to be processed by being decrypted, @@ -184,7 +174,7 @@ typedef union { * 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 @@ -200,6 +190,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 */ @@ -219,9 +212,10 @@ 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_print_sampling; /* print every Nth packet */ int ndo_suppress_default_print; /* don't use default_print() for unknown packet types */ int ndo_tstamp_precision; /* requested time stamp precision */ const char *program_name; /* Name of the program using the library */ @@ -244,9 +238,8 @@ struct netdissect_options { /* stack of saved packet boundary and buffer information */ struct netdissect_saved_packet_info *ndo_packet_info_stack; - /* pointer to the uint_if_printer or the void_if_printer function */ - if_printer_t ndo_if_printer; - int ndo_void_printer; /* void_if_printer ? (FALSE/TRUE) */ + /* pointer to the if_printer function */ + if_printer ndo_if_printer; /* pointer to void function to output stuff */ void (*ndo_default_print)(netdissect_options *, @@ -267,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 */ @@ -294,13 +300,10 @@ extern void nd_pop_all_packet_info(netdissect_options *); #define PT_PTP 18 /* PTP */ #define PT_SOMEIP 19 /* Autosar SOME/IP Protocol */ #define PT_DOMAIN 20 /* Domain Name System (DNS) */ +#define PT_QUIC 21 /* QUIC */ -#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)) @@ -370,7 +373,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))) @@ -386,6 +393,40 @@ extern void nd_pop_all_packet_info(netdissect_options *); */ #define ND_BYTES_AVAILABLE_AFTER(p) ND_BYTES_BETWEEN(ndo->ndo_snapend, (p)) +/* + * Check (expression_1 operator expression_2) for invalid packet with + * a custom message, format %u + */ +#define ND_ICHECKMSG_U(message, expression_1, operator, expression_2) \ +if ((expression_1) operator (expression_2)) { \ +ND_PRINT(" [%s %u %s %u]", (message), (expression_1), (#operator), (expression_2)); \ +goto invalid; \ +} + +/* + * Check (expression_1 operator expression_2) for invalid packet with + * "expression_1" message, format %u + */ +#define ND_ICHECK_U(expression_1, operator, expression_2) \ +ND_ICHECKMSG_U((#expression_1), (expression_1), operator, (expression_2)) + +/* + * Check (expression_1 operator expression_2) for invalid packet with + * a custom message, format %zu + */ +#define ND_ICHECKMSG_ZU(message, expression_1, operator, expression_2) \ +if ((expression_1) operator (expression_2)) { \ +ND_PRINT(" [%s %u %s %zu]", (message), (expression_1), (#operator), (expression_2)); \ +goto invalid; \ +} + +/* + * Check (expression_1 operator expression_2) for invalid packet with + * "expression_1" message, format %zu + */ +#define ND_ICHECK_ZU(expression_1, operator, expression_2) \ +ND_ICHECKMSG_ZU((#expression_1), (expression_1), operator, (expression_2)) + #define ND_PRINT(...) (ndo->ndo_printf)(ndo, __VA_ARGS__) #define ND_DEFAULTPRINT(ap, length) (*ndo->ndo_default_print)(ndo, ap, length) @@ -393,12 +434,15 @@ 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 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(). @@ -415,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? @@ -455,79 +499,85 @@ 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) -extern uint_if_printer lookup_uint_printer(int); -extern void_if_printer lookup_void_printer(int); -extern if_printer_t lookup_printer(netdissect_options *, int); +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) -#define ND_DEBUG {printf(" [%s:%d %s] ", __FILE__, __LINE__, __FUNCTION__); fflush(stdout);} +extern if_printer lookup_printer(int); + +#define ND_DEBUG {printf(" [%s:%d %s] ", __FILE__, __LINE__, __func__); fflush(stdout);} /* The DLT printer routines */ extern void ap1394_if_print IF_PRINTER_ARGS; extern void arcnet_if_print IF_PRINTER_ARGS; extern void arcnet_linux_if_print IF_PRINTER_ARGS; -extern u_int atm_if_print IF_PRINTER_ARGS; +extern void atm_if_print IF_PRINTER_ARGS; +extern void brcm_tag_if_print IF_PRINTER_ARGS; +extern void brcm_tag_prepend_if_print IF_PRINTER_ARGS; extern void bt_if_print IF_PRINTER_ARGS; -extern u_int brcm_tag_if_print IF_PRINTER_ARGS; -extern u_int brcm_tag_prepend_if_print IF_PRINTER_ARGS; -extern u_int chdlc_if_print IF_PRINTER_ARGS; -extern u_int cip_if_print IF_PRINTER_ARGS; -extern u_int dsa_if_print IF_PRINTER_ARGS; -extern u_int edsa_if_print IF_PRINTER_ARGS; +extern void chdlc_if_print IF_PRINTER_ARGS; +extern void cip_if_print IF_PRINTER_ARGS; +extern void dsa_if_print IF_PRINTER_ARGS; +extern void edsa_if_print IF_PRINTER_ARGS; extern void enc_if_print IF_PRINTER_ARGS; -extern u_int ether_if_print IF_PRINTER_ARGS; -extern u_int fddi_if_print IF_PRINTER_ARGS; -extern u_int fr_if_print IF_PRINTER_ARGS; -extern u_int ieee802_11_if_print IF_PRINTER_ARGS; -extern u_int ieee802_11_radio_avs_if_print IF_PRINTER_ARGS; -extern u_int ieee802_11_radio_if_print IF_PRINTER_ARGS; -extern u_int ieee802_15_4_if_print IF_PRINTER_ARGS; -extern u_int ieee802_15_4_tap_if_print IF_PRINTER_ARGS; -extern u_int ipfc_if_print IF_PRINTER_ARGS; -extern u_int ipoib_if_print IF_PRINTER_ARGS; +extern void ether_if_print IF_PRINTER_ARGS; +extern void fddi_if_print IF_PRINTER_ARGS; +extern void fr_if_print IF_PRINTER_ARGS; +extern void ieee802_11_if_print IF_PRINTER_ARGS; +extern void ieee802_11_radio_avs_if_print IF_PRINTER_ARGS; +extern void ieee802_11_radio_if_print IF_PRINTER_ARGS; +extern void ieee802_15_4_if_print IF_PRINTER_ARGS; +extern void ieee802_15_4_tap_if_print IF_PRINTER_ARGS; +extern void ipfc_if_print IF_PRINTER_ARGS; extern void ipnet_if_print IF_PRINTER_ARGS; -extern u_int juniper_atm1_if_print IF_PRINTER_ARGS; -extern u_int juniper_atm2_if_print IF_PRINTER_ARGS; -extern u_int juniper_chdlc_if_print IF_PRINTER_ARGS; -extern u_int juniper_es_if_print IF_PRINTER_ARGS; -extern u_int juniper_ether_if_print IF_PRINTER_ARGS; -extern u_int juniper_frelay_if_print IF_PRINTER_ARGS; -extern u_int juniper_ggsn_if_print IF_PRINTER_ARGS; -extern u_int juniper_mfr_if_print IF_PRINTER_ARGS; -extern u_int juniper_mlfr_if_print IF_PRINTER_ARGS; -extern u_int juniper_mlppp_if_print IF_PRINTER_ARGS; -extern u_int juniper_monitor_if_print IF_PRINTER_ARGS; -extern u_int juniper_ppp_if_print IF_PRINTER_ARGS; -extern u_int juniper_pppoe_atm_if_print IF_PRINTER_ARGS; -extern u_int juniper_pppoe_if_print IF_PRINTER_ARGS; -extern u_int juniper_services_if_print IF_PRINTER_ARGS; -extern u_int lane_if_print IF_PRINTER_ARGS; -extern u_int ltalk_if_print IF_PRINTER_ARGS; -extern u_int mfr_if_print IF_PRINTER_ARGS; -extern u_int netanalyzer_if_print IF_PRINTER_ARGS; -extern u_int netanalyzer_transparent_if_print IF_PRINTER_ARGS; +extern void ipoib_if_print IF_PRINTER_ARGS; +extern void juniper_atm1_if_print IF_PRINTER_ARGS; +extern void juniper_atm2_if_print IF_PRINTER_ARGS; +extern void juniper_chdlc_if_print IF_PRINTER_ARGS; +extern void juniper_es_if_print IF_PRINTER_ARGS; +extern void juniper_ether_if_print IF_PRINTER_ARGS; +extern void juniper_frelay_if_print IF_PRINTER_ARGS; +extern void juniper_ggsn_if_print IF_PRINTER_ARGS; +extern void juniper_mfr_if_print IF_PRINTER_ARGS; +extern void juniper_mlfr_if_print IF_PRINTER_ARGS; +extern void juniper_mlppp_if_print IF_PRINTER_ARGS; +extern void juniper_monitor_if_print IF_PRINTER_ARGS; +extern void juniper_ppp_if_print IF_PRINTER_ARGS; +extern void juniper_pppoe_atm_if_print IF_PRINTER_ARGS; +extern void juniper_pppoe_if_print IF_PRINTER_ARGS; +extern void juniper_services_if_print IF_PRINTER_ARGS; +extern void ltalk_if_print IF_PRINTER_ARGS; +extern void mfr_if_print IF_PRINTER_ARGS; +extern void netanalyzer_if_print IF_PRINTER_ARGS; +extern void netanalyzer_transparent_if_print IF_PRINTER_ARGS; extern void nflog_if_print IF_PRINTER_ARGS; extern void null_if_print IF_PRINTER_ARGS; -extern u_int pflog_if_print IF_PRINTER_ARGS; +extern void pflog_if_print IF_PRINTER_ARGS; extern void pktap_if_print IF_PRINTER_ARGS; extern void ppi_if_print IF_PRINTER_ARGS; -extern u_int ppp_bsdos_if_print IF_PRINTER_ARGS; -extern u_int ppp_hdlc_if_print IF_PRINTER_ARGS; -extern u_int ppp_if_print IF_PRINTER_ARGS; -extern u_int pppoe_if_print IF_PRINTER_ARGS; -extern u_int prism_if_print IF_PRINTER_ARGS; +extern void ppp_bsdos_if_print IF_PRINTER_ARGS; +extern void ppp_hdlc_if_print IF_PRINTER_ARGS; +extern void ppp_if_print IF_PRINTER_ARGS; +extern void pppoe_if_print IF_PRINTER_ARGS; +extern void prism_if_print IF_PRINTER_ARGS; extern void raw_if_print IF_PRINTER_ARGS; extern void sl_bsdos_if_print IF_PRINTER_ARGS; extern void 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 void sll2_if_print IF_PRINTER_ARGS; +extern void sll_if_print IF_PRINTER_ARGS; extern void sunatm_if_print IF_PRINTER_ARGS; extern void symantec_if_print IF_PRINTER_ARGS; -extern u_int token_if_print IF_PRINTER_ARGS; +extern void token_if_print IF_PRINTER_ARGS; extern void unsupported_if_print IF_PRINTER_ARGS; extern void usb_linux_48_byte_if_print IF_PRINTER_ARGS; extern void usb_linux_64_byte_if_print IF_PRINTER_ARGS; -extern u_int vsock_if_print IF_PRINTER_ARGS; +extern void vsock_if_print IF_PRINTER_ARGS; /* * Structure passed to some printers to allow them to print @@ -548,10 +598,10 @@ 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); +extern int arista_ethertype_print(netdissect_options *,const u_char *, u_int); extern void arp_print(netdissect_options *, const u_char *, u_int, u_int); extern void ascii_print(netdissect_options *, const u_char *, u_int); extern void atalk_print(netdissect_options *, const u_char *, u_int); @@ -565,18 +615,20 @@ 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 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); extern void decnet_print(netdissect_options *, const u_char *, u_int, u_int); extern void dhcp6_print(netdissect_options *, const u_char *, u_int); +extern void domain_print(netdissect_options *, const u_char *, u_int, int, int); extern int dstopt_process(netdissect_options *, const u_char *); extern void dtp_print(netdissect_options *, const u_char *, u_int); extern void dvmrp_print(netdissect_options *, const u_char *, u_int); 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 esp_print(netdissect_options *, const u_char *, u_int, const u_char *, u_int, int, u_int); @@ -585,6 +637,7 @@ extern u_int ether_switch_tag_print(netdissect_options *, const u_char *, u_int, extern int ethertype_print(netdissect_options *, u_short, const u_char *, u_int, u_int, const struct lladdr_info *, const struct lladdr_info *); extern u_int fddi_print(netdissect_options *, const u_char *, u_int, u_int); extern void forces_print(netdissect_options *, const u_char *, u_int); +extern const u_char *fqdn_print(netdissect_options *, const u_char *, const u_char *); extern u_int fr_print(netdissect_options *, const u_char *, u_int); extern int frag6_print(netdissect_options *, const u_char *, const u_char *); extern void ftp_print(netdissect_options *, const u_char *, u_int); @@ -593,15 +646,15 @@ 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_process(netdissect_options *, const u_char *, int *, uint32_t *); extern void hex_and_ascii_print(netdissect_options *, const char *, const u_char *, 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 hex_print(netdissect_options *, const char *indent, const u_char *cp, u_int); +extern void hex_print_with_offset(netdissect_options *, const char *indent, const u_char *cp, u_int, u_int); extern void hncp_print(netdissect_options *, const u_char *, u_int); extern void hsrp_print(netdissect_options *, const u_char *, u_int); extern void http_print(netdissect_options *, const u_char *, u_int); extern void icmp6_print(netdissect_options *, const u_char *, u_int, const u_char *, int); extern void icmp_print(netdissect_options *, const u_char *, u_int, const u_char *, int); -extern u_int ieee802_15_4_print(netdissect_options *, const u_char *, u_int); extern u_int ieee802_11_radio_print(netdissect_options *, const u_char *, u_int, u_int); +extern u_int ieee802_15_4_print(netdissect_options *, const u_char *, u_int); extern void igmp_print(netdissect_options *, const u_char *, u_int); extern void igrp_print(netdissect_options *, const u_char *, u_int); extern void ip6_print(netdissect_options *, const u_char *, u_int); @@ -622,15 +675,13 @@ 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); extern void lwres_print(netdissect_options *, const u_char *, u_int); extern void m3ua_print(netdissect_options *, const u_char *, const u_int); -extern int macsec_print(netdissect_options *, const u_char **, - u_int *, u_int *, u_int *, const struct lladdr_info *, - const struct lladdr_info *); +extern int macsec_print(netdissect_options *, const u_char **, u_int *, u_int *, u_int *, const struct lladdr_info *, const struct lladdr_info *); extern u_int mfr_print(netdissect_options *, const u_char *, u_int); extern void mobile_print(netdissect_options *, const u_char *, u_int); extern int mobility_print(netdissect_options *, const u_char *, const u_char *); @@ -643,19 +694,17 @@ extern void nbt_tcp_print(netdissect_options *, const u_char *, u_int); extern void nbt_udp137_print(netdissect_options *, const u_char *, u_int); extern void nbt_udp138_print(netdissect_options *, const u_char *, u_int); 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 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 const u_char *fqdn_print(netdissect_options *, const u_char *, const u_char *); -extern void domain_print(netdissect_options *, const u_char *, u_int, int, 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); 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); +extern void ospf_print(netdissect_options *, const u_char *, u_int, const u_char *); 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 *); @@ -664,29 +713,32 @@ extern void pimv1_print(netdissect_options *, const u_char *, u_int); 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 void ptp_print(netdissect_options *, const u_char *, u_int); extern int print_unknown_data(netdissect_options *, const u_char *, const char *, u_int); +extern void ptp_print(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 int quic_detect(netdissect_options *, const u_char *, const u_int); +extern void quic_print(netdissect_options *, const u_char *, const u_int); extern void radius_print(netdissect_options *, const u_char *, u_int); extern void resp_print(netdissect_options *, const u_char *, u_int); extern void rip_print(netdissect_options *, const u_char *, u_int); extern void ripng_print(netdissect_options *, const u_char *, unsigned int); extern void rpki_rtr_print(netdissect_options *, const u_char *, u_int); -extern void rrcp_print(netdissect_options *, const u_char *, u_int, const struct lladdr_info *, const struct lladdr_info *); 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 rtl_print(netdissect_options *, const u_char *, u_int, const struct lladdr_info *, const struct lladdr_info *); 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); 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_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); extern void snmp_print(netdissect_options *, const u_char *, u_int); +extern void someip_print(netdissect_options *, const u_char *, const u_int); +extern void ssh_print(netdissect_options *, const u_char *, u_int); extern void stp_print(netdissect_options *, const u_char *, u_int); extern void sunrpc_print(netdissect_options *, const u_char *, u_int, const u_char *); extern void syslog_print(netdissect_options *, const u_char *, u_int); @@ -700,19 +752,18 @@ extern void udld_print(netdissect_options *, const u_char *, u_int); extern void udp_print(netdissect_options *, const u_char *, u_int, const u_char *, int, u_int); extern int vjc_print(netdissect_options *, const u_char *, u_short); extern void vqp_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 vtp_print(netdissect_options *, const u_char *, u_int); +extern void vrrp_print(netdissect_options *, const u_char *, u_int, const u_char *, int, int); +extern void vtp_print(netdissect_options *, const u_char *, const u_int); extern void vxlan_gpe_print(netdissect_options *, const u_char *, u_int); extern void vxlan_print(netdissect_options *, const u_char *, u_int); extern void wb_print(netdissect_options *, const u_char *, u_int); +extern void whois_print(netdissect_options *, const u_char *, u_int); extern void zep_print(netdissect_options *, const u_char *, u_int); -extern void zephyr_print(netdissect_options *, const u_char *, int); -extern void zmtp1_print(netdissect_options *, const u_char *, u_int); +extern void zephyr_print(netdissect_options *, const u_char *, u_int); extern void zmtp1_datagram_print(netdissect_options *, const u_char *, const u_int); -extern void someip_print(netdissect_options *, const u_char *, const u_int); +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);