X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/6855c11117b46c93c5ea83b2a9436e67f4dae254..c39d40a767a1ae36171e5bcbf6f157ff3e80fb6c:/print.c diff --git a/print.c b/print.c index 4a03d650..447955f0 100644 --- a/print.c +++ b/print.c @@ -42,21 +42,12 @@ #include "pcap-missing.h" -struct uint_printer { - uint_if_printer f; +struct printer { + if_printer f; int type; }; -struct void_printer { - void_if_printer f; - int type; -}; - -static const struct uint_printer uint_printers[] = { - { NULL, 0 }, -}; - -static const struct void_printer void_printers[] = { +static const struct printer printers[] = { #ifdef DLT_APPLE_IP_OVER_IEEE1394 { ap1394_if_print, DLT_APPLE_IP_OVER_IEEE1394 }, #endif @@ -210,8 +201,8 @@ static const struct void_printer void_printers[] = { { ppp_hdlc_if_print, DLT_PPP_SERIAL }, #endif { ppp_if_print, DLT_PPP }, -#ifdef DLT_PPP_WITHDIRECTION - { ppp_if_print, DLT_PPP_WITHDIRECTION }, +#ifdef DLT_PPP_PPPD + { ppp_if_print, DLT_PPP_PPPD }, #endif #ifdef DLT_PPP_ETHER { pppoe_if_print, DLT_PPP_ETHER }, @@ -255,21 +246,6 @@ static const struct void_printer void_printers[] = { { NULL, 0 }, }; -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(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, uint32_t localnet, uint32_t mask) { @@ -278,49 +254,12 @@ init_print(netdissect_options *ndo, uint32_t localnet, uint32_t mask) init_checksum(); } -uint_if_printer -lookup_uint_printer(int type) -{ - const struct uint_printer *p; - - for (p = uint_printers; p->f; ++p) - if (type == p->type) - return p->f; - -#if defined(DLT_USER2) && defined(DLT_PKTAP) - /* - * Apple incorrectly chose to use DLT_USER2 for their PKTAP - * header. - * - * We map DLT_PKTAP, whether it's DLT_USER2 as it is on Darwin- - * based OSes or the same value as LINKTYPE_PKTAP as it is on - * other OSes, to LINKTYPE_PKTAP, so files written with - * this version of libpcap for a DLT_PKTAP capture have a link- - * layer header type of LINKTYPE_PKTAP. - * - * However, files written on OS X Mavericks for a DLT_PKTAP - * capture have a link-layer header type of LINKTYPE_USER2. - * If we don't have a printer for DLT_USER2, and type is - * DLT_USER2, we look up the printer for DLT_PKTAP and use - * that. - */ - if (type == DLT_USER2) { - for (p = uint_printers; p->f; ++p) - if (DLT_PKTAP == p->type) - return p->f; - } -#endif - - return NULL; - /* NOTREACHED */ -} - -void_if_printer -lookup_void_printer(int type) +if_printer +lookup_printer(int type) { - const struct void_printer *p; + const struct printer *p; - for (p = void_printers; p->f; ++p) + for (p = printers; p->f; ++p) if (type == p->type) return p->f; @@ -342,7 +281,7 @@ lookup_void_printer(int type) * that. */ if (type == DLT_USER2) { - for (p = void_printers; p->f; ++p) + for (p = printers; p->f; ++p) if (DLT_PKTAP == p->type) return p->f; } @@ -352,35 +291,20 @@ lookup_void_printer(int type) /* NOTREACHED */ } -if_printer_t -lookup_printer(netdissect_options *ndo, int type) -{ - if_printer_t printer; - - printer.void_printer = lookup_void_printer(type); - ndo->ndo_void_printer = TRUE; - if (printer.void_printer == NULL) { - printer.uint_printer = lookup_uint_printer(type); - ndo->ndo_void_printer = FALSE; - } - return printer; -} - int has_printer(int type) { - return (lookup_void_printer(type) != NULL || - lookup_uint_printer(type) != NULL); + return (lookup_printer(type) != NULL); } -if_printer_t -get_if_printer(netdissect_options *ndo, int type) +if_printer +get_if_printer(int type) { - if_printer_t printer; + if_printer printer; - printer = lookup_printer(ndo, type); - if (printer.printer == NULL) - printer.void_printer = unsupported_if_print; + printer = lookup_printer(type); + if (printer == NULL) + printer = unsupported_if_print; return printer; } @@ -388,7 +312,7 @@ void pretty_print_packet(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_char *sp, u_int packets_captured) { - u_int hdrlen; + u_int hdrlen = 0; int invalid_header = 0; if (ndo->ndo_packet_number) @@ -447,7 +371,16 @@ pretty_print_packet(netdissect_options *ndo, const struct pcap_pkthdr *h, * bigger lengths. */ - ts_print(ndo, &h->ts); + /* + * The header /usr/include/pcap/pcap.h in OpenBSD declares h->ts as + * struct bpf_timeval, not struct timeval. The former comes from + * /usr/include/net/bpf.h and uses 32-bit unsigned types instead of + * the types used in struct timeval. + */ + struct timeval tvbuf; + tvbuf.tv_sec = h->ts.tv_sec; + tvbuf.tv_usec = h->ts.tv_usec; + ts_print(ndo, &tvbuf); /* * Printers must check that they're not walking off the end of @@ -459,18 +392,19 @@ pretty_print_packet(netdissect_options *ndo, const struct pcap_pkthdr *h, ndo->ndo_protocol = ""; ndo->ndo_ll_hdr_len = 0; - if (setjmp(ndo->ndo_truncated) == 0) { + switch (setjmp(ndo->ndo_early_end)) { + case 0: /* Print the packet. */ - if (ndo->ndo_void_printer == TRUE) { - (ndo->ndo_if_printer.void_printer)(ndo, h, sp); - hdrlen = ndo->ndo_ll_hdr_len; - } else - hdrlen = (ndo->ndo_if_printer.uint_printer)(ndo, h, sp); - } else { + (ndo->ndo_if_printer)(ndo, h, sp); + break; + case ND_TRUNCATED: /* A printer quit because the packet was truncated; report it */ - ND_PRINT(" [|%s]", ndo->ndo_protocol); - hdrlen = ndo->ndo_ll_hdr_len; + nd_print_trunc(ndo); + /* Print the full packet */ + ndo->ndo_ll_hdr_len = 0; + break; } + hdrlen = ndo->ndo_ll_hdr_len; /* * Empty the stack of packet information, freeing all pushed buffers; @@ -557,9 +491,9 @@ ndo_default_print(netdissect_options *ndo, const u_char *bp, u_int length) } /* VARARGS */ -static void +static void NORETURN PRINTFLIKE(3, 4) ndo_error(netdissect_options *ndo, status_exit_codes_t status, - const char *fmt, ...) + FORMAT_STRING(const char *fmt), ...) { va_list ap; @@ -579,8 +513,8 @@ ndo_error(netdissect_options *ndo, status_exit_codes_t status, } /* VARARGS */ -static void -ndo_warning(netdissect_options *ndo, const char *fmt, ...) +static void PRINTFLIKE(2, 3) +ndo_warning(netdissect_options *ndo, FORMAT_STRING(const char *fmt), ...) { va_list ap; @@ -597,8 +531,9 @@ ndo_warning(netdissect_options *ndo, const char *fmt, ...) } } -static int -ndo_printf(netdissect_options *ndo, const char *fmt, ...) +/* VARARGS */ +static int PRINTFLIKE(2, 3) +ndo_printf(netdissect_options *ndo, FORMAT_STRING(const char *fmt), ...) { va_list args; int ret;