X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/4df36ab95d6e23ac109a186c22e2ba60f628c36a..d7b497cac78b6e22a66a6bae9bdec60a8044f67a:/netdissect.h diff --git a/netdissect.h b/netdissect.h index b2f824d3..2782796e 100644 --- a/netdissect.h +++ b/netdissect.h @@ -54,9 +54,19 @@ typedef unsigned char nd_uint64_t[8]; * Use this for IPv4 addresses. It's defined as an array of octets, so * that it's not aligned on its "natural" boundary, and it's defined as * a structure in the hopes that this makes it harder to naively use - * EXTRACT_32BITS() to extract the value - in many cases you just want + * EXTRACT_BE_U_4() to extract the value - in many cases you just want * to use UNALIGNED_MEMCPY() to copy its value, so that it remains in * network byte order. + * + * (Among other things, we don't want somebody thinking "IPv4 addresses, + * they're in network byte order, so we want EXTRACT_BE_U_4(), right?" + * and then handing the result to system APIs that expect network-order + * IPv4 addresses, such as inet_ntop(), on their little-endian PCs, getting + * the wrong behavior, and concluding "oh, it must be in *little*-endian + * order" and "fixing" it to use EXTRACT_LE_U_4(). Yes, people do this; + * that's why Wireshark has tvb_get_ipv4(), to extract an IPv4 address from + * a packet data buffer; it was introduced in reaction to somebody who + * *had* done that.) */ typedef struct { unsigned char bytes[4]; @@ -75,23 +85,20 @@ typedef signed char nd_int8_t; #include #include "ip.h" /* struct ip for nextproto4_cksum() */ +#include "ip6.h" /* struct ip6 for nextproto6_cksum() */ extern int32_t thiszone; /* seconds offset from gmt to local time */ +/* invalid string to print '(invalid)' for malformed or corrupted packets */ +extern const char istr[]; #if !defined(HAVE_SNPRINTF) -int snprintf (char *str, size_t sz, const char *format, ...) -#ifdef __ATTRIBUTE___FORMAT_OK - __attribute__((format (printf, 3, 4))) -#endif /* __ATTRIBUTE___FORMAT_OK */ - ; +int snprintf (char *str, size_t sz, FORMAT_STRING(const char *format), ...) + PRINTFLIKE(3, 4); #endif /* !defined(HAVE_SNPRINTF) */ #if !defined(HAVE_VSNPRINTF) -int vsnprintf (char *str, size_t sz, const char *format, va_list ap) -#ifdef __ATTRIBUTE___FORMAT_OK - __attribute__((format (printf, 3, 0))) -#endif /* __ATTRIBUTE___FORMAT_OK */ - ; +int vsnprintf (char *str, size_t sz, FORMAT_STRING(const char *format), + va_list ap) PRINTFLIKE(3, 0); #endif /* !defined(HAVE_VSNPRINTF) */ #ifndef HAVE_STRLCAT @@ -122,6 +129,20 @@ 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); +/* Initialize netdissect. */ +extern int nd_init(char *, size_t); +/* Clean up netdissect. */ +extern void nd_cleanup(void); + +/* Do we have libsmi support? */ +extern int nd_have_smi_support(void); +/* Load an SMI module. */ +extern int nd_load_smi_module(const char *, char *, size_t); +/* Flag indicating whether an SMI module has been loaded. */ +extern int nd_smi_module_loaded; +/* Version number of the SMI library, or NULL if we don't have libsmi support. */ +extern const char *nd_smi_version_string(void); + typedef struct netdissect_options netdissect_options; #define IF_PRINTER_ARGS (netdissect_options *, const struct pcap_pkthdr *, const u_char *) @@ -132,18 +153,17 @@ struct netdissect_options { int ndo_bflag; /* print 4 byte ASes in ASDOT notation */ int ndo_eflag; /* print ethernet header */ int ndo_fflag; /* don't translate "foreign" IP address */ - int ndo_Kflag; /* don't check TCP checksums */ + int ndo_Kflag; /* don't check IP, TCP or UDP checksums */ int ndo_nflag; /* leave addresses as numbers */ int ndo_Nflag; /* remove domains from printed host names */ int ndo_qflag; /* quick (shorter) output */ - int ndo_mflag; /* use the libsmi to translate OIDs */ int ndo_Sflag; /* print raw TCP sequence numbers */ int ndo_tflag; /* print packet arrival time */ int ndo_uflag; /* Print undecoded NFS handles */ int ndo_vflag; /* verbosity level */ int ndo_xflag; /* print packet in hex */ - int ndo_Xflag; /* print packet in hex/ascii */ - int ndo_Aflag; /* print packet only in ascii observing TAB, + int ndo_Xflag; /* print packet in hex/ASCII */ + int ndo_Aflag; /* print packet only in ASCII observing TAB, * LF, CR and SPACE as graphical chars */ int ndo_Hflag; /* dissect 802.11s draft mesh standard */ @@ -176,27 +196,15 @@ struct netdissect_options { /* pointer to function to do regular output */ int (*ndo_printf)(netdissect_options *, const char *fmt, ...) -#ifdef __ATTRIBUTE___FORMAT_OK_FOR_FUNCTION_POINTERS - __attribute__ ((format (printf, 2, 3))) -#endif - ; + PRINTFLIKE_FUNCPTR(2, 3); /* pointer to function to output errors */ - void (*ndo_error)(netdissect_options *, - const char *fmt, ...) -#ifdef __ATTRIBUTE___NORETURN_OK_FOR_FUNCTION_POINTERS - __attribute__ ((noreturn)) -#endif /* __ATTRIBUTE___NORETURN_OK_FOR_FUNCTION_POINTERS */ -#ifdef __ATTRIBUTE___FORMAT_OK_FOR_FUNCTION_POINTERS - __attribute__ ((format (printf, 2, 3))) -#endif /* __ATTRIBUTE___FORMAT_OK_FOR_FUNCTION_POINTERS */ - ; + void NORETURN_FUNCPTR (*ndo_error)(netdissect_options *, + const char *fmt, ...) + PRINTFLIKE_FUNCPTR(2, 3); /* pointer to function to output warnings */ void (*ndo_warning)(netdissect_options *, const char *fmt, ...) -#ifdef __ATTRIBUTE___FORMAT_OK_FOR_FUNCTION_POINTERS - __attribute__ ((format (printf, 2, 3))) -#endif - ; + PRINTFLIKE_FUNCPTR(2, 3); }; #define PT_VAT 1 /* Visual Audio Tool */ @@ -215,6 +223,7 @@ struct netdissect_options { #define PT_PGM 14 /* [UDP-encapsulated] Pragmatic General Multicast */ #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 */ #ifndef min #define min(a,b) ((a)>(b)?(b):(a)) @@ -223,6 +232,9 @@ struct netdissect_options { #define max(a,b) ((b)>(a)?(b):(a)) #endif +/* For source or destination ports tests (UDP, TCP, ...) */ +#define IS_SRC_OR_DST_PORT(p) (sport == (p) || dport == (p)) + /* * Maximum snapshot length. This should be enough to capture the full * packet on most network interfaces. @@ -244,15 +256,14 @@ struct netdissect_options { * savefile header to control the size of the buffer they allocate, * so a size of, say, 2^31-1 might not work well. * - * XXX - does it need to be bigger still? + * XXX - does it need to be bigger still? Note that, for versions of + * libpcap with pcap_create()/pcap_activate(), if no -s flag is specified + * or -s 0 is specified, we won't set the snapshot length at all, and will + * let libpcap choose a snapshot length; newer versions may choose a bigger + * value than 262144 for D-Bus, for example. */ #define MAXIMUM_SNAPLEN 262144 -/* - * The default snapshot length is the maximum. - */ -#define DEFAULT_SNAPLEN MAXIMUM_SNAPLEN - #define ESRC(ep) ((ep)->ether_shost) #define EDST(ep) ((ep)->ether_dhost) @@ -304,14 +315,16 @@ struct netdissect_options { /* Bail if "var" was not captured */ #define ND_TCHECK(var) ND_TCHECK2(var, sizeof(var)) -#define ND_PRINT(STUFF) (*ndo->ndo_printf)STUFF +#define ND_PRINT(STUFF) (ndo->ndo_printf)STUFF #define ND_DEFAULTPRINT(ap, length) (*ndo->ndo_default_print)(ndo, ap, length) extern void ts_print(netdissect_options *, const struct timeval *); -extern void relts_print(netdissect_options *, int); +extern void signed_relts_print(netdissect_options *, int32_t); +extern void unsigned_relts_print(netdissect_options *, uint32_t); extern void fn_print_char(netdissect_options *, u_char); extern int fn_print(netdissect_options *, const u_char *, const u_char *); +extern u_int fn_printztn(netdissect_options *ndo, const u_char *, u_int, const u_char *); extern int fn_printn(netdissect_options *, const u_char *, u_int, const u_char *); extern int fn_printzp(netdissect_options *, const u_char *, u_int, const u_char *); @@ -337,7 +350,30 @@ extern void txtproto_print(netdissect_options *, const u_char *, u_int, extern void safeputchar(netdissect_options *, const u_char); extern void safeputs(netdissect_options *, const u_char *, const u_int); -#ifdef LBL_ALIGN +#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__))) || \ + (defined(__ppc__) || defined(__ppc64__) || defined(_M_PPC) || defined(_ARCH_PPC) || defined(_ARCH_PPC64)) || \ + (defined(__s390__) || defined(__s390x__) || defined(__zarch__)) || \ + defined(__vax__) +/* + * The procesor natively handles unaligned loads, so just use memcpy() + * and memcmp(), to enable those optimizations. + * + * XXX - are those all the x86 tests we need? + * XXX - do we need to worry about ARMv1 through ARMv5, which didn't + * support unaligned loads, and, if so, do we need to worry about all + * of them, or just some of them, e.g. ARMv5? + * XXX - are those the only 68k tests we need not to generated + * unaligned accesses if the target is the 68000 or 68010? + * XXX - are there any tests we don't need, because some definitions are for + * compilers that also predefine the GCC symbols? + * XXX - do we need to test for both 32-bit and 64-bit versions of those + * architectures in all cases? + */ +#define UNALIGNED_MEMCPY(p, q, l) memcpy((p), (q), (l)) +#define UNALIGNED_MEMCMP(p, q, l) memcmp((p), (q), (l)) +#else /* * The processor doesn't natively handle unaligned loads, * and the compiler might "helpfully" optimize memcpy() @@ -353,13 +389,6 @@ extern void unaligned_memcpy(void *, const void *, size_t); extern int unaligned_memcmp(const void *, const void *, size_t); #define UNALIGNED_MEMCPY(p, q, l) unaligned_memcpy((p), (q), (l)) #define UNALIGNED_MEMCMP(p, q, l) unaligned_memcmp((p), (q), (l)) -#else -/* - * The procesor natively handles unaligned loads, so just use memcpy() - * and memcmp(), to enable those optimizations. - */ -#define UNALIGNED_MEMCPY(p, q, l) memcpy((p), (q), (l)) -#define UNALIGNED_MEMCMP(p, q, l) memcmp((p), (q), (l)) #endif #define PLURAL_SUFFIX(n) \ @@ -389,21 +418,21 @@ 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 ipfc_if_print IF_PRINTER_ARGS; extern u_int ipnet_if_print IF_PRINTER_ARGS; -extern u_int juniper_atm1_print IF_PRINTER_ARGS; -extern u_int juniper_atm2_print IF_PRINTER_ARGS; -extern u_int juniper_chdlc_print IF_PRINTER_ARGS; -extern u_int juniper_es_print IF_PRINTER_ARGS; -extern u_int juniper_ether_print IF_PRINTER_ARGS; -extern u_int juniper_frelay_print IF_PRINTER_ARGS; -extern u_int juniper_ggsn_print IF_PRINTER_ARGS; -extern u_int juniper_mfr_print IF_PRINTER_ARGS; -extern u_int juniper_mlfr_print IF_PRINTER_ARGS; -extern u_int juniper_mlppp_print IF_PRINTER_ARGS; -extern u_int juniper_monitor_print IF_PRINTER_ARGS; -extern u_int juniper_ppp_print IF_PRINTER_ARGS; -extern u_int juniper_pppoe_atm_print IF_PRINTER_ARGS; -extern u_int juniper_pppoe_print IF_PRINTER_ARGS; -extern u_int juniper_services_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; @@ -426,8 +455,23 @@ extern u_int sll_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_print IF_PRINTER_ARGS; -extern u_int usb_linux_64_byte_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; + +/* + * Structure passed to some printers to allow them to print + * link-layer address information if ndo_eflag isn't set + * (because they are for protocols that don't have their + * own addresses, so that we'd want to report link-layer + * address information). + * + * This contains a pointer to an address and a pointer to a routine + * to which we pass that pointer in order to get a string. + */ +struct lladdr_info { + const char *(*addr_string)(netdissect_options *, const u_char *); + const u_char *addr; +}; /* The printer routines. */ @@ -446,7 +490,7 @@ extern void bfd_print(netdissect_options *, const u_char *, u_int, u_int); extern void bgp_print(netdissect_options *, const u_char *, int); extern 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 *, 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, int); extern void cdp_print(netdissect_options *, const u_char *, u_int, u_int); extern void cfm_print(netdissect_options *, const u_char *, u_int); @@ -462,22 +506,23 @@ extern void dvmrp_print(netdissect_options *, const u_char *, u_int); extern void eap_print(netdissect_options *, const u_char *, u_int); extern void egp_print(netdissect_options *, const u_char *, u_int); extern void eigrp_print(netdissect_options *, const u_char *, u_int); -extern int esp_print(netdissect_options *, const u_char *, const int, const u_char *, int *, int *); +extern int esp_print(netdissect_options *, const u_char *, const int, const u_char *, u_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 int ethertype_print(netdissect_options *, u_short, const u_char *, u_int, 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 u_int fr_print(netdissect_options *, register 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); extern void geneve_print(netdissect_options *, const u_char *, u_int); -extern void geonet_print(netdissect_options *, const u_char *, const u_char *, u_int); +extern void geonet_print(netdissect_options *, const u_char *, u_int, const struct lladdr_info *); extern void gre_print(netdissect_options *, const u_char *, u_int); extern int hbhopt_print(netdissect_options *, const u_char *); extern void hex_and_ascii_print(netdissect_options *, const char *, const u_char *, u_int); extern void hex_and_ascii_print_with_offset(netdissect_options *, const char *, const u_char *, u_int, 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 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); @@ -488,19 +533,19 @@ 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_inner(netdissect_options *, const u_char *, u_int, u_int nh, const u_char *); -extern int ipcomp_print(netdissect_options *, register const u_char *, int *); +extern void ipcomp_print(netdissect_options *, register 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); extern void isakmp_print(netdissect_options *, const u_char *, u_int, const u_char *); extern void isakmp_rfc3948_print(netdissect_options *, const u_char *, u_int, const u_char *); -extern void isoclns_print(netdissect_options *, const u_char *, u_int, u_int); +extern void isoclns_print(netdissect_options *, const u_char *, u_int); extern void krb_print(netdissect_options *, const u_char *); extern void l2tp_print(netdissect_options *, const u_char *, u_int); extern void lane_print(netdissect_options *, const u_char *, u_int, u_int); extern void ldp_print(netdissect_options *, const u_char *, u_int); extern void lisp_print(netdissect_options *, const u_char *, u_int); 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 u_char *, const u_char *); +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); @@ -509,7 +554,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 void medsa_print(netdissect_options *, const u_char *, u_int, u_int); +extern void medsa_print(netdissect_options *, const u_char *, u_int, u_int, const struct lladdr_info *, const struct lladdr_info *); extern u_int mfr_print(netdissect_options *, register 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 *); @@ -523,12 +568,13 @@ extern void nbt_udp137_print(netdissect_options *, const u_char *, int); extern void nbt_udp138_print(netdissect_options *, const u_char *, int); extern void netbeui_print(netdissect_options *, u_short, const u_char *, int); extern void nfsreply_print(netdissect_options *, const u_char *, u_int, const u_char *); -extern void nfsreply_print_noaddr(netdissect_options *, const u_char *, u_int, const u_char *); -extern void nfsreq_print_noaddr(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 nfsreq_noaddr_print(netdissect_options *, const u_char *, u_int, const u_char *); extern const u_char * ns_nprint (netdissect_options *, register const u_char *, register const u_char *); -extern void ns_print(netdissect_options *, const u_char *, u_int, int); +extern void domain_print(netdissect_options *, const u_char *, u_int, int); +extern void nsh_print(netdissect_options *ndo, const u_char *bp, u_int len); extern void ntp_print(netdissect_options *, const u_char *, u_int); -extern int oam_print(netdissect_options *, const u_char *, u_int, 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 ospf6_print(netdissect_options *, const u_char *, u_int); @@ -546,14 +592,15 @@ extern int print_unknown_data(netdissect_options *, const u_char *, const char * extern 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 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); +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 rtsp_print(netdissect_options *, const u_char *, u_int); -extern void rx_print(netdissect_options *, register const u_char *, int, int, int, const u_char *); +extern void rx_print(netdissect_options *, register const u_char *, u_int, u_int, u_int, 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 sip_print(netdissect_options *, const u_char *, u_int); @@ -561,10 +608,10 @@ extern void slow_print(netdissect_options *, const u_char *, u_int); extern void smb_print_data(netdissect_options *, const unsigned char *, int); extern void smb_tcp_print(netdissect_options *, const u_char *, 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 u_char *, 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 stp_print(netdissect_options *, const u_char *, u_int); -extern void sunrpcrequest_print(netdissect_options *, const u_char *, u_int, const u_char *); +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); extern void tcp_print(netdissect_options *, const u_char *, u_int, const u_char *, int); extern void telnet_print(netdissect_options *, const u_char *, u_int); @@ -578,11 +625,12 @@ extern int vjc_print(netdissect_options *, register const char *, u_short); extern void vqp_print(netdissect_options *, register const u_char *, register 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 vxlan_gpe_print(netdissect_options *ndo, const u_char *bp, u_int len); extern void vxlan_print(netdissect_options *, const u_char *, u_int); extern void wb_print(netdissect_options *, const void *, 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 zmtp1_print_datagram(netdissect_options *, const u_char *, const u_int); +extern void zmtp1_datagram_print(netdissect_options *, const u_char *, const u_int); /* checksum routines */ extern void init_checksum(void); @@ -598,6 +646,9 @@ extern uint16_t in_cksum_shouldbe(uint16_t, uint16_t); extern int nextproto4_cksum(netdissect_options *, const struct ip *, const uint8_t *, u_int, u_int, u_int); +/* in print-ip6.c */ +extern int nextproto6_cksum(netdissect_options *, const struct ip6_hdr *, const uint8_t *, u_int, u_int, u_int); + /* Utilities */ extern int mask2plen(uint32_t); extern int mask62plen(const u_char *);