Check the containing item length in some loops.

[tcpdump] / tcpdump.c

diff --git a/tcpdump.c b/tcpdump.c
index 745d367e63047b979352e5fc6df8e014ca6598e2..87005e57aa1070692b4b0c518750aa7b7e4c5116 100644 (file)
--- a/tcpdump.c
+++ b/tcpdump.c
@@ -131,12 +131,21 @@ static void info(int);
 static u_int packets_captured;
 
 typedef u_int (*if_printer)(const struct pcap_pkthdr *, const u_char *);
+typedef u_int (*if_ndo_printer)(struct netdissect_options *ndo,
+                                const struct pcap_pkthdr *, const u_char *);
 
 struct printer {
-       if_printer f;
+        if_printer f;
        int type;
 };
 
+
+struct ndo_printer {
+        if_ndo_printer f;
+       int type;
+};
+
+
 static struct printer printers[] = {
        { arcnet_if_print,      DLT_ARCNET },
 #ifdef DLT_ARCNET_LINUX
@@ -151,7 +160,7 @@ static struct printer printers[] = {
        { cip_if_print,         DLT_CIP },
 #endif
 #ifdef DLT_ATM_CLIP
-       { cip_if_print,         DLT_ATM_CLIP },
+       { cip_if_print,         DLT_ATM_CLIP },
 #endif
        { sl_if_print,          DLT_SLIP },
 #ifdef DLT_SLIP_BSDOS
@@ -178,7 +187,7 @@ static struct printer printers[] = {
        { chdlc_if_print,       DLT_HDLC },
 #endif
 #ifdef DLT_PPP_SERIAL
-       { ppp_hdlc_if_print,    DLT_PPP_SERIAL },
+       { ppp_hdlc_if_print,    DLT_PPP_SERIAL },
 #endif
 #ifdef DLT_PPP_ETHER
        { pppoe_if_print,       DLT_PPP_ETHER },
@@ -193,7 +202,7 @@ static struct printer printers[] = {
        { ltalk_if_print,       DLT_LTALK },
 #endif
 #if defined(DLT_PFLOG) && defined(HAVE_NET_PFVAR_H)
-       { pflog_if_print,       DLT_PFLOG },
+       { pflog_if_print,       DLT_PFLOG },
 #endif
 #ifdef DLT_FR
        { fr_if_print,          DLT_FR },
@@ -214,10 +223,10 @@ static struct printer printers[] = {
        { ieee802_11_radio_if_print,    DLT_IEEE802_11_RADIO },
 #endif
 #ifdef DLT_ENC
-       { enc_if_print,         DLT_ENC },
+       { enc_if_print,         DLT_ENC },
 #endif
 #ifdef DLT_SYMANTEC_FIREWALL
-       { symantec_if_print,    DLT_SYMANTEC_FIREWALL },
+       { symantec_if_print,    DLT_SYMANTEC_FIREWALL },
 #endif
 #ifdef DLT_APPLE_IP_OVER_IEEE1394
        { ap1394_if_print,      DLT_APPLE_IP_OVER_IEEE1394 },
@@ -259,31 +268,43 @@ static struct printer printers[] = {
        { juniper_services_print, DLT_JUNIPER_SERVICES },
 #endif
 #ifdef DLT_JUNIPER_ETHER
-       { juniper_ether_print, DLT_JUNIPER_ETHER },
+       { juniper_ether_print,  DLT_JUNIPER_ETHER },
 #endif
 #ifdef DLT_JUNIPER_PPP
-       { juniper_ppp_print, DLT_JUNIPER_PPP },
+       { juniper_ppp_print,    DLT_JUNIPER_PPP },
 #endif
 #ifdef DLT_JUNIPER_FRELAY
-       { juniper_frelay_print, DLT_JUNIPER_FRELAY },
+       { juniper_frelay_print, DLT_JUNIPER_FRELAY },
 #endif
 #ifdef DLT_JUNIPER_CHDLC
-       { juniper_chdlc_print, DLT_JUNIPER_CHDLC },
+       { juniper_chdlc_print,  DLT_JUNIPER_CHDLC },
 #endif
 #ifdef DLT_MFR
-       { mfr_if_print, DLT_MFR },
+       { mfr_if_print,         DLT_MFR },
 #endif
 #if defined(DLT_BLUETOOTH_HCI_H4_WITH_PHDR) && defined(HAVE_PCAP_BLUETOOTH_H)
-       { bt_if_print, DLT_BLUETOOTH_HCI_H4_WITH_PHDR},
-#endif
-#if defined(HAVE_PCAP_USB_H) && defined(DLT_USB_LINUX)
-       { usb_linux_print, DLT_USB_LINUX},
-#endif
-#if defined(HAVE_PCAP_USB_H) && defined(DLT_USB_LINUX_MMAPPED)
-       { usb_linux_print, DLT_USB_LINUX_MMAPPED},
+       { bt_if_print,          DLT_BLUETOOTH_HCI_H4_WITH_PHDR},
+#endif
+#ifdef HAVE_PCAP_USB_H
+#ifdef DLT_USB_LINUX
+       { usb_linux_48_byte_print, DLT_USB_LINUX},
+#endif /* DLT_USB_LINUX */
+#ifdef DLT_USB_LINUX_MMAPPED
+       { usb_linux_64_byte_print, DLT_USB_LINUX_MMAPPED},
+#endif /* DLT_USB_LINUX_MMAPPED */
+#endif /* HAVE_PCAP_USB_H */
+#ifdef DLT_IPV4
+       { raw_if_print,         DLT_IPV4 },
+#endif
+#ifdef DLT_IPV6
+       { raw_if_print,         DLT_IPV6 },
 #endif
+       { NULL,                 0 },
+};
+
+static struct ndo_printer ndo_printers[] = {
 #ifdef DLT_IPNET
-       { ipnet_if_print, DLT_IPNET },
+       { ipnet_if_print,       DLT_IPNET },
 #endif
        { NULL,                 0 },
 };
@@ -301,6 +322,19 @@ lookup_printer(int type)
        /* NOTREACHED */
 }
 
+static if_ndo_printer
+lookup_ndo_printer(int type)
+{
+       struct ndo_printer *p;
+
+       for (p = ndo_printers; p->f; ++p)
+               if (type == p->type)
+                       return p->f;
+
+       return NULL;
+       /* NOTREACHED */
+}
+
 static pcap_t *pd;
 
 static int supports_monitor_mode;
@@ -310,7 +344,12 @@ extern int opterr;
 extern char *optarg;
 
 struct print_info {
-       if_printer printer;
+        netdissect_options *ndo;
+        union {
+                if_printer     printer;
+                if_ndo_printer ndo_printer;
+        } p;
+        int ndo_type;
 };
 
 struct dump_info {
@@ -358,7 +397,8 @@ show_dlts_and_exit(const char *device, pcap_t *pd)
                        /*
                         * OK, does tcpdump handle that type?
                         */
-                       if (lookup_printer(dlts[n_dlts]) == NULL)
+                       if (lookup_printer(dlts[n_dlts]) == NULL
+                            && lookup_ndo_printer(dlts[n_dlts]) == NULL)
                                (void) fprintf(stderr, " (printing not supported)");
                        putchar('\n');
                } else {
@@ -1166,15 +1206,21 @@ main(int argc, char **argv)
                }
        } else {
                type = pcap_datalink(pd);
-               printinfo.printer = lookup_printer(type);
-               if (printinfo.printer == NULL) {
-                       gndo->ndo_dltname = pcap_datalink_val_to_name(type);
-                       if (gndo->ndo_dltname != NULL)
-                               error("packet printing is not supported for link type %s: use -w",
-                                     gndo->ndo_dltname);
-                       else
-                               error("packet printing is not supported for link type %d: use -w", type);
-               }
+                printinfo.ndo_type = 1;
+                printinfo.ndo = gndo;
+               printinfo.p.ndo_printer = lookup_ndo_printer(type);
+                if (printinfo.p.ndo_printer == NULL) {
+                        printinfo.p.printer = lookup_printer(type);
+                        printinfo.ndo_type = 0;
+                        if (printinfo.p.printer == NULL) {
+                                gndo->ndo_dltname = pcap_datalink_val_to_name(type);
+                                if (gndo->ndo_dltname != NULL)
+                                        error("packet printing is not supported for link type %s: use -w",
+                                              gndo->ndo_dltname);
+                                else
+                                        error("packet printing is not supported for link type %d: use -w", type);
+                        }
+                }
                callback = print_packet;
                pcap_userdata = (u_char *)&printinfo;
        }
@@ -1558,7 +1604,12 @@ print_packet(u_char *user, const struct pcap_pkthdr *h, const u_char *sp)
         */
        snapend = sp + h->caplen;
 
-       hdrlen = (*print_info->printer)(h, sp);
+        if(print_info->ndo_type) {
+                hdrlen = (*print_info->p.ndo_printer)(print_info->ndo, h, sp);
+        } else {
+                hdrlen = (*print_info->p.printer)(h, sp);
+        }
+                
        if (Xflag) {
                /*
                 * Print the raw packet data in hex and ASCII.