Merge pull request #703 from nmap/update-gitignore

[tcpdump] / print.c

diff --git a/print.c b/print.c
index c6e354309ea8a4fa175c9e4dac273e0a1681d294..9ee88eb1758d1206b256043c8b0c47dd7e388f26 100644 (file)
--- a/print.c
+++ b/print.c
@@ -70,7 +70,7 @@ static const struct printer printers[] = {
        { 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 },
@@ -223,6 +223,12 @@ 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 },
 };
@@ -320,11 +326,11 @@ pretty_print_packet(netdissect_options *ndo, const struct pcap_pkthdr *h,
        u_int hdrlen;
        int invalid_header = 0;
 
-       if(ndo->ndo_packet_number)
+       if (ndo->ndo_packet_number)
                ND_PRINT("%5u  ", packets_captured);
 
        /* Sanity checks on packet length / capture length */
-       if(h->caplen == 0) {
+       if (h->caplen == 0) {
                invalid_header = 1;
                ND_PRINT("[Invalid header: caplen==0");
        }
@@ -471,7 +477,7 @@ ndo_error(netdissect_options *ndo, status_exit_codes_t status,
 {
        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);
@@ -492,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);