Include the CFLAGS setting when configure was run in the compiler flags.

[tcpdump] / tcpdump.c

diff --git a/tcpdump.c b/tcpdump.c
index d50feb0896940ca2f040909d8ab506708d01fe1b..06683af344a483ff5c9874d546e7aea165654afa 100644 (file)
--- a/tcpdump.c
+++ b/tcpdump.c
@@ -90,9 +90,9 @@ extern int SIZE_BUF;
 netdissect_options Gndo;
 netdissect_options *gndo = &Gndo;
 
-int dflag;                     /* print filter code */
-int Lflag;                     /* list available data link types and exit */
-char *zflag = NULL;            /* compress each savefile using a specified command (like gzip or bzip2) */
+static int dflag;                      /* print filter code */
+static int Lflag;                      /* list available data link types and exit */
+static char *zflag = NULL;             /* compress each savefile using a specified command (like gzip or bzip2) */
 
 static int infodelay;
 static int infoprint;
@@ -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
@@ -276,15 +285,14 @@ static struct printer printers[] = {
 #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},
-#endif
-#ifdef DLT_IPNET
-       { ipnet_if_print,       DLT_IPNET },
-#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
@@ -294,6 +302,13 @@ static struct printer printers[] = {
        { NULL,                 0 },
 };
 
+static struct ndo_printer ndo_printers[] = {
+#ifdef DLT_IPNET
+       { ipnet_if_print,       DLT_IPNET },
+#endif
+       { NULL,                 0 },
+};
+
 static if_printer
 lookup_printer(int type)
 {
@@ -307,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;
@@ -316,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 {
@@ -364,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 {
@@ -566,7 +600,7 @@ main(int argc, char **argv)
 
        opterr = 0;
        while (
-           (op = getopt(argc, argv, "aA" B_FLAG "c:C:d" D_FLAG "eE:fF:G:i:" I_FLAG "KlLm:M:nNOpqr:Rs:StT:u" U_FLAG "vw:W:xXy:Yz:Z:")) != -1)
+           (op = getopt(argc, argv, "aAb" B_FLAG "c:C:d" D_FLAG "eE:fF:G:i:" I_FLAG "KlLm:M:nNOpqr:Rs:StT:u" U_FLAG "vw:W:xXy:Yz:Z:")) != -1)
                switch (op) {
 
                case 'a':
@@ -576,6 +610,7 @@ main(int argc, char **argv)
                case 'A':
                        ++Aflag;
                        break;
+
                case 'b':
                        ++bflag;
                        break;
@@ -1172,15 +1207,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;
        }
@@ -1564,7 +1605,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.
@@ -1734,7 +1780,7 @@ usage(void)
 #endif /* WIN32 */
 #endif /* HAVE_PCAP_LIB_VERSION */
        (void)fprintf(stderr,
-"Usage: %s [-aAd" D_FLAG "ef" I_FLAG "KlLnNOpqRStu" U_FLAG "vxX]" B_FLAG_USAGE " [ -c count ]\n", program_name);
+"Usage: %s [-aAbd" D_FLAG "ef" I_FLAG "KlLnNOpqRStu" U_FLAG "vxX]" B_FLAG_USAGE " [ -c count ]\n", program_name);
        (void)fprintf(stderr,
 "\t\t[ -C file_size ] [ -E algo:secret ] [ -F file ] [ -G seconds ]\n");
        (void)fprintf(stderr,