X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/e2f14ebc87586ecad6901c09a1cb7e371baf2ea1..c39d40a767a1ae36171e5bcbf6f157ff3e80fb6c:/netdissect.h diff --git a/netdissect.h b/netdissect.h index 37c07f13..d9b3f853 100644 --- a/netdissect.h +++ b/netdissect.h @@ -31,6 +31,7 @@ #include #include #include "status-exit-codes.h" +#include "funcattrs.h" /* for PRINTFLIKE_FUNCPTR() */ /* * Data types corresponding to multi-byte integral values within data @@ -61,6 +62,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 +100,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]; /* @@ -109,11 +112,9 @@ typedef unsigned char nd_byte; * 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))) +#define roundup2(x, y) (((x)+((u_int)((y)-1)))&(~((u_int)((y)-1)))) #endif -/* nd_snprintf et al */ - #include #include @@ -166,7 +167,7 @@ typedef struct netdissect_options netdissect_options; #define IF_PRINTER_ARGS (netdissect_options *, const struct pcap_pkthdr *, const u_char *) -typedef u_int (*if_printer) IF_PRINTER_ARGS; +typedef void (*if_printer) IF_PRINTER_ARGS; /* * In case the data in a buffer needs to be processed by being decrypted, @@ -194,6 +195,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 +217,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 */ @@ -229,6 +233,7 @@ struct netdissect_options { int ndo_packettype; /* as specified by -T */ int ndo_snaplen; + int ndo_ll_hdr_len; /* link-layer header length */ /*global pointers to beginning and end of current packet (during printing) */ const u_char *ndo_packetp; @@ -283,13 +288,12 @@ extern void nd_pop_all_packet_info(netdissect_options *); #define PT_PGM_ZMTP1 15 /* ZMTP/1.0 inside PGM (native or UDP-encapsulated) */ #define PT_LMP 16 /* Link Management Protocol */ #define PT_RESP 17 /* RESP */ +#define PT_PTP 18 /* PTP */ +#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)) @@ -304,7 +308,7 @@ extern void nd_pop_all_packet_info(netdissect_options *); * 1) big enough for maximum-size Linux loopback packets (65549) * and some USB packets captured with USBPcap: * - * http://desowin.org/usbpcap/ + * https://desowin.org/usbpcap/ * * (> 131072, < 262144) * @@ -340,7 +344,7 @@ extern void nd_pop_all_packet_info(netdissect_options *); * you subtract a positive integer from a pointer, the result is * guaranteed to be less than the original pointer value). See * - * http://www.kb.cert.org/vuls/id/162289 + * https://www.kb.cert.org/vuls/id/162289 */ /* @@ -359,7 +363,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))) @@ -375,6 +383,28 @@ extern void nd_pop_all_packet_info(netdissect_options *); */ #define ND_BYTES_AVAILABLE_AFTER(p) ND_BYTES_BETWEEN(ndo->ndo_snapend, (p)) +/* Check length < minimum for invalid packet with a custom message, format %u */ +#define ND_LCHECKMSG_U(length, minimum, what) \ +if ((length) < (minimum)) { \ +ND_PRINT(" [%s %u < %u]", (what), (length), (minimum)); \ +goto invalid; \ +} + +/* Check length < minimum for invalid packet with #length message, format %u */ +#define ND_LCHECK_U(length, minimum) \ +ND_LCHECKMSG_U((length), (minimum), (#length)) + +/* Check length < minimum for invalid packet with a custom message, format %zu */ +#define ND_LCHECKMSG_ZU(length, minimum, what) \ +if ((length) < (minimum)) { \ +ND_PRINT(" [%s %u < %zu]", (what), (length), (minimum)); \ +goto invalid; \ +} + +/* Check length < minimum for invalid packet with #length message, format %zu */ +#define ND_LCHECK_ZU(length, minimum) \ +ND_LCHECKMSG_ZU((length), (minimum), (#length)) + #define ND_PRINT(...) (ndo->ndo_printf)(ndo, __VA_ARGS__) #define ND_DEFAULTPRINT(ap, length) (*ndo->ndo_default_print)(ndo, ap, length) @@ -384,10 +414,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(). @@ -397,35 +427,6 @@ extern int nd_printzp(netdissect_options *, const u_char *, u_int, const u_char extern void txtproto_print(netdissect_options *, const u_char *, u_int, const char **, u_int); -/* - * Locale-independent macros for testing character properties and - * stripping the 8th bit from characters. - * - * Byte values outside the ASCII range are considered unprintable, so - * both ND_ISPRINT() and ND_ISGRAPH() return "false" for them. - * - * Assumed to be handed a value between 0 and 255, i.e. don't hand them - * a char, as those might be in the range -128 to 127. - */ -#define ND_ISASCII(c) (!((c) & 0x80)) /* value is an ASCII code point */ -#define ND_ISPRINT(c) ((c) >= 0x20 && (c) <= 0x7E) -#define ND_ISGRAPH(c) ((c) > 0x20 && (c) <= 0x7E) -#define ND_TOASCII(c) ((c) & 0x7F) - -/* - * Locale-independent macros for coverting to upper or lower case. - * - * Byte values outside the ASCII range are not converted. Byte values - * *in* the ASCII range are converted to byte values in the ASCII range; - * in particular, 'i' is upper-cased to 'I" and 'I' is lower-cased to 'i', - * even in Turkish locales. - * - * Assumed to be handed a value between 0 and 255, i.e. don't hand - * them a char, as those might be in the range -128 to 127. - */ -#define ND_TOLOWER(c) (((c) >= 'A' && (c) <= 'Z') ? (c) - 'A' + 'a' : (c)) -#define ND_TOUPPER(c) (((c) >= 'a' && (c) <= 'z') ? (c) - 'a' + 'A' : (c)) - #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__))) || \ @@ -473,76 +474,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) +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 */ -extern u_int ap1394_if_print IF_PRINTER_ARGS; -extern u_int arcnet_if_print IF_PRINTER_ARGS; -extern u_int arcnet_linux_if_print IF_PRINTER_ARGS; -extern u_int atm_if_print IF_PRINTER_ARGS; -extern u_int 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 u_int 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 u_int 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 u_int nflog_if_print IF_PRINTER_ARGS; -extern u_int null_if_print IF_PRINTER_ARGS; -extern u_int pflog_if_print IF_PRINTER_ARGS; -extern u_int pktap_if_print IF_PRINTER_ARGS; -extern u_int 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 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; -extern u_int usb_linux_48_byte_if_print IF_PRINTER_ARGS; -extern u_int usb_linux_64_byte_if_print IF_PRINTER_ARGS; -extern u_int vsock_if_print IF_PRINTER_ARGS; +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 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 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 ipoib_if_print IF_PRINTER_ARGS; +extern void ipnet_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 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; +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 sunatm_if_print IF_PRINTER_ARGS; +extern void symantec_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 void vsock_if_print IF_PRINTER_ARGS; /* * Structure passed to some printers to allow them to print @@ -563,15 +573,16 @@ 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_print_ethertype(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); extern void atm_print(netdissect_options *, u_int, u_int, u_int, const u_char *, u_int, u_int); extern void babel_print(netdissect_options *, const u_char *, u_int); +extern void bcm_li_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); @@ -579,7 +590,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); @@ -587,18 +598,21 @@ 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); 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_print_switch_tag(netdissect_options *, const u_char *, u_int, u_int, void (*)(netdissect_options *, const u_char *), u_int); +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); @@ -607,15 +621,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); @@ -636,12 +650,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 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 *); @@ -654,19 +669,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); 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 *); @@ -675,7 +688,8 @@ 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 int print_unknown_data(netdissect_options *, const u_char *, const char *, 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); @@ -687,17 +701,17 @@ 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); 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_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); 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); @@ -712,14 +726,14 @@ extern void udp_print(netdissect_options *, const u_char *, u_int, const u_char 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 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 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 zmtp1_print(netdissect_options *, const u_char *, u_int); /* checksum routines */ extern void init_checksum(void); @@ -734,7 +748,7 @@ extern uint16_t in_cksum(const struct cksum_vec *, int); extern uint16_t in_cksum_shouldbe(uint16_t, uint16_t); /* IP protocol demuxing routines */ -extern void ip_print_demux(netdissect_options *, const u_char *, u_int, u_int, int, u_int, uint8_t, const u_char *); +extern void ip_demux_print(netdissect_options *, const u_char *, u_int, u_int, int, u_int, uint8_t, const u_char *); extern uint16_t nextproto4_cksum(netdissect_options *, const struct ip *, const uint8_t *, u_int, u_int, uint8_t); @@ -744,19 +758,19 @@ extern uint16_t nextproto6_cksum(netdissect_options *, const struct ip6_hdr *, c /* Utilities */ extern void nd_print_trunc(netdissect_options *); 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 mask62plen(const u_char *); -extern const char *dnname_string(netdissect_options *, u_short); extern const char *dnnum_string(netdissect_options *, u_short); extern int decode_prefix4(netdissect_options *, const u_char *, u_int, char *, size_t); extern int decode_prefix6(netdissect_options *, const u_char *, u_int, char *, size_t); -extern void esp_print_decodesecret(netdissect_options *); -extern int esp_print_decrypt_buffer_by_ikev2(netdissect_options *, int, +extern void esp_decodesecret_print(netdissect_options *); +extern int esp_decrypt_buffer_by_ikev2_print(netdissect_options *, int, const u_char spii[8], const u_char spir[8], const u_char *, const u_char *);