X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/bdeb75099d0cbe0f10021f62346e4a97809121ae..a8abce5c5e2dce2ba6dbccd5d3829da104b80f9c:/print.c diff --git a/print.c b/print.c index e4f1a465..7460b777 100644 --- a/print.c +++ b/print.c @@ -37,6 +37,9 @@ #include "netdissect.h" #include "addrtoname.h" #include "print.h" +#include "netdissect-alloc.h" + +#include "pcap-missing.h" struct printer { if_printer f; @@ -63,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 }, @@ -82,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 @@ -125,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 @@ -225,8 +231,9 @@ static void ndo_default_print(netdissect_options *ndo, const u_char *bp, u_int length); static void NORETURN ndo_error(netdissect_options *ndo, + status_exit_codes_t status, FORMAT_STRING(const char *fmt), ...) - PRINTFLIKE(2, 3); + PRINTFLIKE(3, 4); static void ndo_warning(netdissect_options *ndo, FORMAT_STRING(const char *fmt), ...) PRINTFLIKE(2, 3); @@ -237,7 +244,7 @@ static int ndo_printf(netdissect_options *ndo, void init_print(netdissect_options *ndo, uint32_t localnet, uint32_t mask, - uint32_t timezone_offset) + uint32_t timezone_offset) { thiszone = timezone_offset; @@ -298,11 +305,11 @@ get_if_printer(netdissect_options *ndo, int 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 printer; @@ -310,7 +317,7 @@ get_if_printer(netdissect_options *ndo, int type) void pretty_print_packet(netdissect_options *ndo, const struct pcap_pkthdr *h, - const u_char *sp, u_int packets_captured) + const u_char *sp, u_int packets_captured) { u_int hdrlen; int invalid_header = 0; @@ -338,6 +345,22 @@ pretty_print_packet(netdissect_options *ndo, const struct pcap_pkthdr *h, 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; @@ -347,7 +370,12 @@ pretty_print_packet(netdissect_options *ndo, const struct pcap_pkthdr *h, * 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); @@ -360,7 +388,7 @@ pretty_print_packet(netdissect_options *ndo, const struct pcap_pkthdr *h, */ ndo->ndo_snapend = sp + h->caplen; - hdrlen = (ndo->ndo_if_printer)(ndo, h, sp); + hdrlen = (ndo->ndo_if_printer)(ndo, h, sp); /* * Restore the original snapend, as a printer might have @@ -384,7 +412,7 @@ pretty_print_packet(netdissect_options *ndo, 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) { /* @@ -394,7 +422,7 @@ pretty_print_packet(netdissect_options *ndo, 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 @@ -403,7 +431,7 @@ pretty_print_packet(netdissect_options *ndo, 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) { /* @@ -426,6 +454,7 @@ pretty_print_packet(netdissect_options *ndo, const struct pcap_pkthdr *h, } ND_PRINT("\n"); + nd_free_all(ndo); } /* @@ -439,7 +468,8 @@ 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; @@ -454,7 +484,7 @@ ndo_error(netdissect_options *ndo, const char *fmt, ...) (void)fputc('\n', stderr); } nd_cleanup(); - exit(1); + exit(status); /* NOTREACHED */ } @@ -488,7 +518,8 @@ ndo_printf(netdissect_options *ndo, const char *fmt, ...) va_end(args); if (ret < 0) - ndo_error(ndo, "Unable to write output: %s", pcap_strerror(errno)); + ndo_error(ndo, S_ERR_ND_WRITE_FILE, + "Unable to write output: %s", pcap_strerror(errno)); return (ret); } @@ -500,9 +531,3 @@ ndo_set_function_pointers(netdissect_options *ndo) ndo->ndo_error=ndo_error; ndo->ndo_warning=ndo_warning; } -/* - * Local Variables: - * c-style: whitesmith - * c-basic-offset: 8 - * End: - */