Fix spaces

[tcpdump] / print.c

diff --git a/print.c b/print.c
index be61aff97c84430655ef49b1c90c83921eb1d112..7460b777035e5efe79111f9e2234c1621622e9fb 100644 (file)
--- 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,7 +66,7 @@ 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
@@ -82,7 +85,7 @@ 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
@@ -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);
@@ -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;
@@ -346,6 +353,14 @@ pretty_print_packet(netdissect_options *ndo, const struct pcap_pkthdr *h,
                        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;
@@ -356,7 +371,11 @@ pretty_print_packet(netdissect_options *ndo, const struct pcap_pkthdr *h,
         *   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);
@@ -435,6 +454,7 @@ pretty_print_packet(netdissect_options *ndo, const struct pcap_pkthdr *h,
        }
 
        ND_PRINT("\n");
+       nd_free_all(ndo);
 }
 
 /*
@@ -448,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;
 
@@ -463,7 +484,7 @@ ndo_error(netdissect_options *ndo, const char *fmt, ...)
                        (void)fputc('\n', stderr);
        }
        nd_cleanup();
-       exit(1);
+       exit(status);
        /* NOTREACHED */
 }
 
@@ -497,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);
 }
 
@@ -509,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:
- */