X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/e9204baafd77423ae744e5bebf5605a5cc3a8022..refs/heads/master:/netdissect.h diff --git a/netdissect.h b/netdissect.h index da97f2d2..ca2b5665 100644 --- a/netdissect.h +++ b/netdissect.h @@ -30,7 +30,9 @@ #endif #include #include +#include #include "status-exit-codes.h" +#include "funcattrs.h" /* for PRINTFLIKE_FUNCPTR() */ /* * Data types corresponding to multi-byte integral values within data @@ -56,13 +58,28 @@ typedef signed char nd_int8_t[1]; /* * "unsigned char" so that sign extension isn't done on the - * individual bytes while they're being assembled. + * individual bytes while they're being assembled. Use + * GET_S_BE_n() and GET_S_LE_n() macros to extract the value + * as a signed integer. */ +typedef unsigned char nd_int16_t[2]; +typedef unsigned char nd_int24_t[3]; typedef unsigned char nd_int32_t[4]; +typedef unsigned char nd_int40_t[5]; +typedef unsigned char nd_int48_t[6]; +typedef unsigned char nd_int56_t[7]; typedef unsigned char nd_int64_t[8]; #define FMAXINT (4294967296.0) /* floating point rep. of MAXINT */ +/* + * Data types corresponding to multi-byte floating_point values within + * data structures. These are defined as arrays of octets, for the + * same reason that we do so for integral values. + */ +typedef unsigned char nd_float[4]; +typedef unsigned char nd_double[8]; + /* * Use this for IPv4 addresses and netmasks. * @@ -99,8 +116,14 @@ typedef unsigned char nd_ipv6[16]; /* * Use this for MAC addresses. */ -#define MAC_ADDR_LEN 6 /* length of MAC addresses */ -typedef unsigned char nd_mac_addr[MAC_ADDR_LEN]; +#define MAC48_LEN 6U /* length of MAC addresses */ +typedef unsigned char nd_mac48[MAC48_LEN]; + +/* + * Use this for EUI64s. + */ +#define EUI64_LEN 8U +typedef unsigned char nd_eui64[EUI64_LEN]; /* * Use this for blobs of bytes; make them arrays of nd_byte. @@ -127,10 +150,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 @@ -140,13 +159,10 @@ 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); -extern char *bittok2str_nosep(const struct tok *, const char *, u_int); +extern const char *tok2str(const struct tok *, const char *, const u_int); +extern char *bittok2str(const struct tok *, const char *, const u_int); +extern char *bittok2str_nosep(const struct tok *, const char *, const u_int); /* Initialize netdissect. */ extern int nd_init(char *, size_t); @@ -178,7 +194,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 @@ -219,6 +235,8 @@ struct netdissect_options { 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_lengths; /* print packet header caplen and len */ + 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 */ @@ -263,13 +281,17 @@ 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 *); +/* + * Report a packet truncation with a longjmp(). + */ +NORETURN void nd_trunc_longjmp(netdissect_options *ndo); + #define PT_VAT 1 /* Visual Audio Tool */ #define PT_WB 2 /* distributed White Board */ #define PT_RPC 3 /* Remote Procedure Call */ @@ -290,6 +312,7 @@ 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 */ #define ND_MIN(a,b) ((a)>(b)?(b):(a)) #define ND_MAX(a,b) ((b)>(a)?(b):(a)) @@ -362,7 +385,17 @@ 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 */ -#define ND_TCHECK_LEN(p, l) if (!ND_TTEST_LEN(p, l)) goto trunc +#ifdef ND_LONGJMP_FROM_TCHECK +#define ND_TCHECK_LEN(p, l) \ +do { \ +if (!ND_TTEST_LEN(p, l)) nd_trunc_longjmp(ndo); \ +} while (0) +#else +#define ND_TCHECK_LEN(p, l) \ +do { \ +if (!ND_TTEST_LEN(p, l)) goto trunc; \ +} while (0) +#endif /* Bail out if "*(p)" was not captured */ #define ND_TCHECK_SIZE(p) ND_TCHECK_LEN(p, sizeof(*(p))) @@ -370,13 +403,51 @@ extern void nd_pop_all_packet_info(netdissect_options *); /* * Number of bytes between two pointers. */ -#define ND_BYTES_BETWEEN(p1, p2) ((u_int)(((const uint8_t *)(p1)) - (const uint8_t *)(p2))) +#define ND_BYTES_BETWEEN(p1, p2) ((const u_char *)(p1) >= (const u_char *)(p2) ? 0 : ((u_int)(((const u_char *)(p2)) - (const u_char *)(p1)))) /* * Number of bytes remaining in the captured data, starting at the * byte pointed to by the argument. */ -#define ND_BYTES_AVAILABLE_AFTER(p) ND_BYTES_BETWEEN(ndo->ndo_snapend, (p)) +#define ND_BYTES_AVAILABLE_AFTER(p) ((const u_char *)(p) < ndo->ndo_packetp ? 0 : ND_BYTES_BETWEEN((p), ndo->ndo_snapend)) + +/* + * 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) \ +do { \ +if ((expression_1) operator (expression_2)) { \ +ND_PRINT(" [%s %u %s %u]", (message), (expression_1), (#operator), (expression_2)); \ +goto invalid; \ +} \ +} while (0) + +/* + * 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) \ +do { \ +if ((expression_1) operator (expression_2)) { \ +ND_PRINT(" [%s %u %s %zu]", (message), (expression_1), (#operator), (expression_2)); \ +goto invalid; \ +} \ +} while (0) + +/* + * 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) @@ -385,12 +456,16 @@ 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); +extern void nd_print_bytes_hex(netdissect_options *, const u_char *, u_int); /* * Flags for txtproto_print(). @@ -407,7 +482,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? @@ -444,12 +519,21 @@ extern int unaligned_memcmp(const void *, const void *, size_t); #define PLURAL_SUFFIX(n) \ (((n) != 1) ? "s" : "") -extern const char *tok2strary_internal(const char **, int, const char *, int); +extern const char *tok2strary_internal(const char **, int, const char *, const 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 */ @@ -457,9 +541,9 @@ 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 void atm_if_print IF_PRINTER_ARGS; -extern void bt_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 void chdlc_if_print IF_PRINTER_ARGS; extern void cip_if_print IF_PRINTER_ARGS; extern void dsa_if_print IF_PRINTER_ARGS; @@ -474,8 +558,8 @@ 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 ipoib_if_print IF_PRINTER_ARGS; extern void ipnet_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; @@ -500,7 +584,6 @@ extern void null_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 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; @@ -508,8 +591,8 @@ 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 void sll_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 void token_if_print IF_PRINTER_ARGS; @@ -540,7 +623,7 @@ extern int ah_print(netdissect_options *, const u_char *); 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); @@ -554,27 +637,31 @@ 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 eap_print(netdissect_options *, const u_char *, const 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_i_ii_print(netdissect_options *, uint16_t, const u_char *, u_int); +extern void erspan_iii_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); 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); 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); @@ -583,20 +670,20 @@ 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 void icmp_print(netdissect_options *, const u_char *, u_int, 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); 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(netdissect_options *, const u_char *, const u_int); 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); @@ -618,9 +705,7 @@ 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 *); @@ -633,19 +718,18 @@ 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 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); 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 *); @@ -654,29 +738,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 void radius_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 *); +extern void radius_print(netdissect_options *, const u_char *, const 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, 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); @@ -690,19 +777,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); @@ -727,7 +813,7 @@ extern void nd_print_protocol(netdissect_options *); extern void nd_print_protocol_caps(netdissect_options *); extern void nd_print_invalid(netdissect_options *); -extern int mask2plen(uint32_t); +extern int mask2plen(const uint32_t); extern int mask62plen(const u_char *); extern const char *dnnum_string(netdissect_options *, u_short);