X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/0845bc813c1cc48b18cdefff0b387c110647463c..c0af6af3011d4c55bdadf3dd76cd5fc1115c50d0:/print.c diff --git a/print.c b/print.c index 0d831daa..9ee88eb1 100644 --- a/print.c +++ b/print.c @@ -26,18 +26,20 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include #include -#include +#include "netdissect-stdinc.h" #include "netdissect.h" -#include "interface.h" #include "addrtoname.h" #include "print.h" +#include "netdissect-alloc.h" + +#include "pcap-missing.h" struct printer { if_printer f; @@ -64,11 +66,11 @@ static const struct printer printers[] = { #ifdef DLT_NETANALYZER_TRANSPARENT { netanalyzer_transparent_if_print, DLT_NETANALYZER_TRANSPARENT }, #endif -#if defined(DLT_NFLOG) && defined(HAVE_PCAP_NFLOG_H) +#ifdef DLT_NFLOG { nflog_if_print, DLT_NFLOG}, #endif #ifdef DLT_CIP - { cip_if_print, DLT_CIP }, + { cip_if_print, DLT_CIP }, #endif #ifdef DLT_ATM_CLIP { cip_if_print, DLT_ATM_CLIP }, @@ -83,11 +85,11 @@ static const struct printer printers[] = { #ifdef DLT_APPLE_IP_OVER_IEEE1394 { ap1394_if_print, DLT_APPLE_IP_OVER_IEEE1394 }, #endif -#if defined(DLT_BLUETOOTH_HCI_H4_WITH_PHDR) && defined(HAVE_PCAP_BLUETOOTH_H) +#ifdef DLT_BLUETOOTH_HCI_H4_WITH_PHDR { bt_if_print, DLT_BLUETOOTH_HCI_H4_WITH_PHDR}, #endif #ifdef DLT_LANE8023 - { lane_if_print, DLT_LANE8023 }, + { lane_if_print, DLT_LANE8023 }, #endif { arcnet_if_print, DLT_ARCNET }, #ifdef DLT_ARCNET_LINUX @@ -100,14 +102,12 @@ static const struct printer printers[] = { #ifdef DLT_IPV6 { raw_if_print, DLT_IPV6 }, #endif -#ifdef HAVE_PCAP_USB_H #ifdef DLT_USB_LINUX - { usb_linux_48_byte_print, DLT_USB_LINUX}, + { usb_linux_48_byte_if_print, DLT_USB_LINUX}, #endif /* DLT_USB_LINUX */ #ifdef DLT_USB_LINUX_MMAPPED - { usb_linux_64_byte_print, DLT_USB_LINUX_MMAPPED}, + { usb_linux_64_byte_if_print, DLT_USB_LINUX_MMAPPED}, #endif /* DLT_USB_LINUX_MMAPPED */ -#endif /* HAVE_PCAP_USB_H */ #ifdef DLT_SYMANTEC_FIREWALL { symantec_if_print, DLT_SYMANTEC_FIREWALL }, #endif @@ -128,6 +128,9 @@ static const struct printer printers[] = { #ifdef DLT_LINUX_SLL { sll_if_print, DLT_LINUX_SLL }, #endif +#ifdef DLT_LINUX_SLL2 + { sll2_if_print, DLT_LINUX_SLL2 }, +#endif #ifdef DLT_FR { fr_if_print, DLT_FR }, #endif @@ -152,49 +155,49 @@ static const struct printer printers[] = { { ltalk_if_print, DLT_LTALK }, #endif #ifdef DLT_JUNIPER_ATM1 - { juniper_atm1_print, DLT_JUNIPER_ATM1 }, + { juniper_atm1_if_print, DLT_JUNIPER_ATM1 }, #endif #ifdef DLT_JUNIPER_ATM2 - { juniper_atm2_print, DLT_JUNIPER_ATM2 }, + { juniper_atm2_if_print, DLT_JUNIPER_ATM2 }, #endif #ifdef DLT_JUNIPER_MFR - { juniper_mfr_print, DLT_JUNIPER_MFR }, + { juniper_mfr_if_print, DLT_JUNIPER_MFR }, #endif #ifdef DLT_JUNIPER_MLFR - { juniper_mlfr_print, DLT_JUNIPER_MLFR }, + { juniper_mlfr_if_print, DLT_JUNIPER_MLFR }, #endif #ifdef DLT_JUNIPER_MLPPP - { juniper_mlppp_print, DLT_JUNIPER_MLPPP }, + { juniper_mlppp_if_print, DLT_JUNIPER_MLPPP }, #endif #ifdef DLT_JUNIPER_PPPOE - { juniper_pppoe_print, DLT_JUNIPER_PPPOE }, + { juniper_pppoe_if_print, DLT_JUNIPER_PPPOE }, #endif #ifdef DLT_JUNIPER_PPPOE_ATM - { juniper_pppoe_atm_print, DLT_JUNIPER_PPPOE_ATM }, + { juniper_pppoe_atm_if_print, DLT_JUNIPER_PPPOE_ATM }, #endif #ifdef DLT_JUNIPER_GGSN - { juniper_ggsn_print, DLT_JUNIPER_GGSN }, + { juniper_ggsn_if_print, DLT_JUNIPER_GGSN }, #endif #ifdef DLT_JUNIPER_ES - { juniper_es_print, DLT_JUNIPER_ES }, + { juniper_es_if_print, DLT_JUNIPER_ES }, #endif #ifdef DLT_JUNIPER_MONITOR - { juniper_monitor_print, DLT_JUNIPER_MONITOR }, + { juniper_monitor_if_print, DLT_JUNIPER_MONITOR }, #endif #ifdef DLT_JUNIPER_SERVICES - { juniper_services_print, DLT_JUNIPER_SERVICES }, + { juniper_services_if_print, DLT_JUNIPER_SERVICES }, #endif #ifdef DLT_JUNIPER_ETHER - { juniper_ether_print, DLT_JUNIPER_ETHER }, + { juniper_ether_if_print, DLT_JUNIPER_ETHER }, #endif #ifdef DLT_JUNIPER_PPP - { juniper_ppp_print, DLT_JUNIPER_PPP }, + { juniper_ppp_if_print, DLT_JUNIPER_PPP }, #endif #ifdef DLT_JUNIPER_FRELAY - { juniper_frelay_print, DLT_JUNIPER_FRELAY }, + { juniper_frelay_if_print, DLT_JUNIPER_FRELAY }, #endif #ifdef DLT_JUNIPER_CHDLC - { juniper_chdlc_print, DLT_JUNIPER_CHDLC }, + { juniper_chdlc_if_print, DLT_JUNIPER_CHDLC }, #endif #ifdef DLT_PKTAP { pktap_if_print, DLT_PKTAP }, @@ -220,38 +223,35 @@ static const struct printer printers[] = { #endif #ifdef DLT_PPP_SERIAL { ppp_hdlc_if_print, DLT_PPP_SERIAL }, +#endif +#ifdef DLT_DSA_TAG_BRCM + { brcm_tag_if_print, DLT_DSA_TAG_BRCM }, +#endif +#ifdef DLT_DSA_TAG_BRCM_PREPEND + { brcm_tag_prepend_if_print, DLT_DSA_TAG_BRCM_PREPEND }, #endif { NULL, 0 }, }; - static void ndo_default_print(netdissect_options *ndo, const u_char *bp, u_int length); -static void ndo_error(netdissect_options *ndo _U_, const char *fmt, ...) - __attribute__((noreturn)) -#ifdef __ATTRIBUTE___FORMAT_OK - __attribute__((format (printf, 2, 3))) -#endif /* __ATTRIBUTE___FORMAT_OK */ - ; -static void ndo_warning(netdissect_options *ndo _U_, const char *fmt, ...) -#ifdef __ATTRIBUTE___FORMAT_OK - __attribute__((format (printf, 2, 3))) -#endif /* __ATTRIBUTE___FORMAT_OK */ - ; - -static int tcpdump_printf(netdissect_options *ndo _U_, const char *fmt, ...) -#ifdef __ATTRIBUTE___FORMAT_OK - __attribute ((format (printf, 2, 3))) -#endif /* __ATTRIBUTE___FORMAT_OK */ - ; +static void NORETURN ndo_error(netdissect_options *ndo, + status_exit_codes_t status, + FORMAT_STRING(const char *fmt), ...) + PRINTFLIKE(3, 4); +static void ndo_warning(netdissect_options *ndo, + FORMAT_STRING(const char *fmt), ...) + PRINTFLIKE(2, 3); + +static int ndo_printf(netdissect_options *ndo, + FORMAT_STRING(const char *fmt), ...) + PRINTFLIKE(2, 3); void -init_print(netdissect_options *ndo, u_int32_t localnet, u_int32_t mask, - uint32_t timezone_offset) +init_print(netdissect_options *ndo, uint32_t localnet, uint32_t mask) { - thiszone = timezone_offset; init_addrtoname(ndo, localnet, mask); init_checksum(); } @@ -296,54 +296,103 @@ lookup_printer(int type) int has_printer(int type) { - return (lookup_printer(type) != NULL); } -struct print_info -get_print_info(netdissect_options *ndo, int type) +if_printer +get_if_printer(netdissect_options *ndo, int type) { const char *dltname; - struct print_info printinfo; + if_printer printer; - printinfo.ndo = ndo; - printinfo.printer = lookup_printer(type); - if (printinfo.printer == NULL) { + printer = lookup_printer(type); + if (printer == NULL) { dltname = pcap_datalink_val_to_name(type); if (dltname != NULL) - (*ndo->ndo_error)(ndo, + (*ndo->ndo_error)(ndo, S_ERR_ND_NO_PRINTER, "packet printing is not supported for link type %s: use -w", dltname); else - (*ndo->ndo_error)(ndo, + (*ndo->ndo_error)(ndo, S_ERR_ND_NO_PRINTER, "packet printing is not supported for link type %d: use -w", type); } - return (printinfo); + return printer; } void -pretty_print_packet(struct print_info *print_info, const struct pcap_pkthdr *h, - const u_char *sp, u_int packets_captured) +pretty_print_packet(netdissect_options *ndo, const struct pcap_pkthdr *h, + const u_char *sp, u_int packets_captured) { u_int hdrlen; - netdissect_options *ndo; + int invalid_header = 0; - ndo = print_info->ndo; + if (ndo->ndo_packet_number) + ND_PRINT("%5u ", packets_captured); + + /* Sanity checks on packet length / capture length */ + if (h->caplen == 0) { + invalid_header = 1; + ND_PRINT("[Invalid header: caplen==0"); + } + if (h->len == 0) { + if (!invalid_header) { + invalid_header = 1; + ND_PRINT("[Invalid header:"); + } else + ND_PRINT(","); + ND_PRINT(" len==0"); + } else if (h->len < h->caplen) { + if (!invalid_header) { + invalid_header = 1; + ND_PRINT("[Invalid header:"); + } else + ND_PRINT(","); + ND_PRINT(" len(%u) < caplen(%u)", h->len, h->caplen); + } + if (h->caplen > MAXIMUM_SNAPLEN) { + if (!invalid_header) { + invalid_header = 1; + ND_PRINT("[Invalid header:"); + } else + ND_PRINT(","); + ND_PRINT(" caplen(%u) > %u", h->caplen, MAXIMUM_SNAPLEN); + } + if (h->len > MAXIMUM_SNAPLEN) { + if (!invalid_header) { + invalid_header = 1; + ND_PRINT("[Invalid header:"); + } else + ND_PRINT(","); + ND_PRINT(" len(%u) > %u", h->len, MAXIMUM_SNAPLEN); + } + if (invalid_header) { + ND_PRINT("]\n"); + return; + } - if(ndo->ndo_packet_number) - ND_PRINT((ndo, "%5u ", packets_captured)); + /* + * At this point: + * capture length != 0, + * packet length != 0, + * capture length <= MAXIMUM_SNAPLEN, + * packet length <= MAXIMUM_SNAPLEN, + * packet length >= capture length. + * + * Currently, there is no D-Bus printer, thus no need for + * bigger lengths. + */ ts_print(ndo, &h->ts); /* - * Some printers want to check that they're not walking off the - * end of the packet. + * Printers must check that they're not walking off the end of + * the packet. * Rather than pass it all the way down, we set this member * of the netdissect_options structure. */ ndo->ndo_snapend = sp + h->caplen; - hdrlen = (*print_info->printer)(print_info->ndo, h, sp); + hdrlen = (ndo->ndo_if_printer)(ndo, h, sp); /* * Restore the original snapend, as a printer might have @@ -367,7 +416,7 @@ pretty_print_packet(struct print_info *print_info, const struct pcap_pkthdr *h, */ if (h->caplen > hdrlen) hex_and_ascii_print(ndo, "\n\t", sp + hdrlen, - h->caplen - hdrlen); + h->caplen - hdrlen); } } else if (ndo->ndo_xflag) { /* @@ -377,7 +426,7 @@ pretty_print_packet(struct print_info *print_info, const struct pcap_pkthdr *h, /* * Include the link-layer header. */ - hex_print(ndo, "\n\t", sp, h->caplen); + hex_print(ndo, "\n\t", sp, h->caplen); } else { /* * Don't include the link-layer header - and if @@ -386,7 +435,7 @@ pretty_print_packet(struct print_info *print_info, const struct pcap_pkthdr *h, */ if (h->caplen > hdrlen) hex_print(ndo, "\n\t", sp + hdrlen, - h->caplen - hdrlen); + h->caplen - hdrlen); } } else if (ndo->ndo_Aflag) { /* @@ -408,7 +457,8 @@ pretty_print_packet(struct print_info *print_info, const struct pcap_pkthdr *h, } } - putchar('\n'); + ND_PRINT("\n"); + nd_free_all(ndo); } /* @@ -422,11 +472,12 @@ ndo_default_print(netdissect_options *ndo, const u_char *bp, u_int length) /* VARARGS */ static void -ndo_error(netdissect_options *ndo, const char *fmt, ...) +ndo_error(netdissect_options *ndo, status_exit_codes_t status, + const char *fmt, ...) { va_list ap; - if(ndo->program_name) + if (ndo->program_name) (void)fprintf(stderr, "%s: ", ndo->program_name); va_start(ap, fmt); (void)vfprintf(stderr, fmt, ap); @@ -436,7 +487,8 @@ ndo_error(netdissect_options *ndo, const char *fmt, ...) if (fmt[-1] != '\n') (void)fputc('\n', stderr); } - exit(1); + nd_cleanup(); + exit(status); /* NOTREACHED */ } @@ -446,7 +498,7 @@ ndo_warning(netdissect_options *ndo, const char *fmt, ...) { va_list ap; - if(ndo->program_name) + if (ndo->program_name) (void)fprintf(stderr, "%s: ", ndo->program_name); (void)fprintf(stderr, "WARNING: "); va_start(ap, fmt); @@ -460,7 +512,7 @@ ndo_warning(netdissect_options *ndo, const char *fmt, ...) } static int -tcpdump_printf(netdissect_options *ndo _U_, const char *fmt, ...) +ndo_printf(netdissect_options *ndo, const char *fmt, ...) { va_list args; int ret; @@ -469,21 +521,17 @@ tcpdump_printf(netdissect_options *ndo _U_, const char *fmt, ...) ret = vfprintf(stdout, fmt, args); va_end(args); + if (ret < 0) + ndo_error(ndo, S_ERR_ND_WRITE_FILE, + "Unable to write output: %s", pcap_strerror(errno)); return (ret); } void ndo_set_function_pointers(netdissect_options *ndo) { - ndo->ndo_default_print=ndo_default_print; - ndo->ndo_printf=tcpdump_printf; + ndo->ndo_printf=ndo_printf; ndo->ndo_error=ndo_error; ndo->ndo_warning=ndo_warning; } -/* - * Local Variables: - * c-style: whitesmith - * c-basic-offset: 8 - * End: - */