*/
-#ifdef HAVE_CONFIG_H
#include <config.h>
-#endif
#include <stdlib.h>
#include <string.h>
#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[] = {
-#ifdef DLT_C_HDLC
- { chdlc_if_print, DLT_C_HDLC },
-#endif
-#ifdef DLT_HDLC
- { chdlc_if_print, DLT_HDLC },
-#endif
-#if defined(DLT_PFLOG) && defined(HAVE_NET_IF_PFLOG_H)
- { pflog_if_print, DLT_PFLOG },
-#endif
-#ifdef DLT_LTALK
- { ltalk_if_print, DLT_LTALK },
-#endif
- { 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
#ifdef DLT_BLUETOOTH_HCI_H4_WITH_PHDR
{ bt_if_print, DLT_BLUETOOTH_HCI_H4_WITH_PHDR},
#endif
+#ifdef DLT_C_HDLC
+ { chdlc_if_print, DLT_C_HDLC },
+#endif
+#ifdef DLT_HDLC
+ { chdlc_if_print, DLT_HDLC },
+#endif
#ifdef DLT_ATM_CLIP
{ cip_if_print, DLT_ATM_CLIP },
#endif
#ifdef DLT_JUNIPER_SERVICES
{ juniper_services_if_print, DLT_JUNIPER_SERVICES },
#endif
+#ifdef DLT_LTALK
+ { ltalk_if_print, DLT_LTALK },
+#endif
#ifdef DLT_MFR
{ mfr_if_print, DLT_MFR },
#endif
#ifdef DLT_LOOP
{ null_if_print, DLT_LOOP },
#endif
+#ifdef DLT_PFLOG
+ { pflog_if_print, DLT_PFLOG },
+#endif
#ifdef DLT_PKTAP
{ pktap_if_print, DLT_PKTAP },
#endif
{ 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 },
void
init_print(netdissect_options *ndo, uint32_t localnet, uint32_t mask)
{
-
init_addrtoname(ndo, localnet, mask);
- init_checksum();
}
-uint_if_printer
-lookup_uint_printer(int type)
+if_printer
+lookup_printer(int type)
{
- const struct uint_printer *p;
+ const struct printer *p;
- for (p = uint_printers; p->f; ++p)
+ for (p = printers; p->f; ++p)
if (type == p->type)
return p->f;
* that.
*/
if (type == DLT_USER2) {
- for (p = uint_printers; p->f; ++p)
+ for (p = printers; p->f; ++p)
if (DLT_PKTAP == p->type)
return p->f;
}
/* NOTREACHED */
}
-void_if_printer
-lookup_void_printer(int type)
-{
- const struct void_printer *p;
-
- for (p = void_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 = void_printers; p->f; ++p)
- if (DLT_PKTAP == p->type)
- return p->f;
- }
-#endif
-
- return NULL;
- /* 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;
}
+#ifdef ENABLE_INSTRUMENT_FUNCTIONS
+extern int profile_func_level;
+static int pretty_print_packet_level = -1;
+#endif
+
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;
+#ifdef ENABLE_INSTRUMENT_FUNCTIONS
+ if (pretty_print_packet_level == -1)
+ pretty_print_packet_level = profile_func_level;
+#endif
+
if (ndo->ndo_packet_number)
ND_PRINT("%5u ", packets_captured);
* 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
* of the netdissect_options structure.
*/
ndo->ndo_snapend = sp + h->caplen;
+ ndo->ndo_packetp = sp;
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;
+#ifdef ENABLE_INSTRUMENT_FUNCTIONS
+ /* truncation => reassignment */
+ profile_func_level = pretty_print_packet_level;
+#endif
+ break;
}
+ hdrlen = ndo->ndo_ll_hdr_len;
/*
* Empty the stack of packet information, freeing all pushed buffers;
nd_pop_all_packet_info(ndo);
/*
- * Restore the original snapend, as a printer might have
- * changed it.
+ * Restore the originals snapend and packetp, as a printer
+ * might have changed them.
+ *
+ * XXX - nd_pop_all_packet_info() should have restored the
+ * original values, but, just in case....
*/
ndo->ndo_snapend = sp + h->caplen;
+ ndo->ndo_packetp = sp;
if (ndo->ndo_Xflag) {
/*
* Print the raw packet data in hex and ASCII.
projects / tcpdump / blobdiff