X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/8ece0a663f1d163d8468697d6525ef7f6d4f9597..5ef0bcb5edd748de9d9af13c40da0395dfdd94e8:/netdissect.h diff --git a/netdissect.h b/netdissect.h index fddcdc46..b774ae63 100644 --- a/netdissect.h +++ b/netdissect.h @@ -61,6 +61,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. * @@ -164,15 +166,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, @@ -235,7 +229,7 @@ struct netdissect_options { int ndo_packettype; /* as specified by -T */ int ndo_snaplen; - int ndo_ll_header_length; /* link-layer header length */ + 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; @@ -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 *, @@ -293,13 +286,10 @@ extern void nd_pop_all_packet_info(netdissect_options *); #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)) @@ -454,78 +444,76 @@ 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); +extern if_printer lookup_printer(int); #define ND_DEBUG {printf(" [%s:%d %s] ", __FILE__, __LINE__, __FUNCTION__); fflush(stdout);} /* The DLT printer routines */ extern void 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 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 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 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 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 ipoib_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 u_int nflog_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 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 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 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 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 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 @@ -555,6 +543,7 @@ 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); @@ -574,11 +563,12 @@ 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); @@ -625,6 +615,9 @@ 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 *); @@ -641,7 +634,7 @@ extern void nfsreply_print(netdissect_options *, const u_char *, u_int, const u_ 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 *fqdn_print(netdissect_options *, const u_char *, const u_char *); -extern void domain_print(netdissect_options *, const u_char *, u_int, int); +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); @@ -659,7 +652,7 @@ 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 *, int); +extern int print_unknown_data(netdissect_options *, const u_char *, const 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); @@ -671,7 +664,7 @@ 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); @@ -718,7 +711,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); @@ -739,8 +732,8 @@ 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 *);