X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/7e9c5bfd4d6e4527610dad734257c5b20a5602cd..6d3b0e4599c5aa922bba42e53b038b51d9024a62:/netdissect.h?ds=sidebyside diff --git a/netdissect.h b/netdissect.h index 53bc842f..867be794 100644 --- a/netdissect.h +++ b/netdissect.h @@ -141,9 +141,6 @@ struct tok { const char *s; /* string */ }; -extern const char *tok2strbuf(const struct tok *, const char *, u_int, - char *buf, size_t bufsize); - /* tok2str is deprecated */ extern const char *tok2str(const struct tok *, const char *, u_int); extern char *bittok2str(const struct tok *, const char *, u_int); @@ -220,6 +217,7 @@ 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_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 */ @@ -384,27 +382,39 @@ 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)); \ +/* + * Check (expression_1 operator expression_2) for invalid packet with + * a custom message, format %u + */ +#define ND_ICHECKMSG_U(message, expression_1, operator, expression_2) \ +if ((expression_1) operator (expression_2)) { \ +ND_PRINT(" [%s %u %s %u]", (message), (expression_1), (#operator), (expression_2)); \ goto invalid; \ } -/* Check length < minimum for invalid packet with #length message, format %u */ -#define ND_LCHECK_U(length, minimum) \ -ND_LCHECKMSG_U((length), (minimum), (#length)) +/* + * 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 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)); \ +/* + * Check (expression_1 operator expression_2) for invalid packet with + * a custom message, format %zu + */ +#define ND_ICHECKMSG_ZU(message, expression_1, operator, expression_2) \ +if ((expression_1) operator (expression_2)) { \ +ND_PRINT(" [%s %u %s %zu]", (message), (expression_1), (#operator), (expression_2)); \ goto invalid; \ } -/* Check length < minimum for invalid packet with #length message, format %zu */ -#define ND_LCHECK_ZU(length, minimum) \ -ND_LCHECKMSG_ZU((length), (minimum), (#length)) +/* + * 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) @@ -494,9 +504,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; @@ -511,8 +521,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; @@ -545,8 +555,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; @@ -700,9 +710,9 @@ 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); @@ -733,6 +743,7 @@ 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 *, u_int); extern void zmtp1_datagram_print(netdissect_options *, const u_char *, const u_int);