Add support for DLT_PRISM and DLT_IEEE802_11_RADIO.

[tcpdump] / tcpdump.c

diff --git a/tcpdump.c b/tcpdump.c
index 2f2710e56ef90ace91bf5e393b8673217b867834..6b02404ae2aaacf54de8173313392b09020ca3e3 100644 (file)
--- a/tcpdump.c
+++ b/tcpdump.c
@@ -30,7 +30,7 @@ static const char copyright[] =
     "@(#) Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 2000\n\
 The Regents of the University of California.  All rights reserved.\n";
 static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/tcpdump.c,v 1.184 2002-08-09 13:50:15 risso Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/tcpdump.c,v 1.189 2002-12-12 07:28:36 guy Exp $ (LBL)";
 #endif
 
 /*
@@ -104,7 +104,8 @@ int32_t thiszone;           /* seconds offset from gmt to local time */
 static RETSIGTYPE cleanup(int);
 static void usage(void) __attribute__((noreturn));
 
-static void dump_and_trunc(u_char *, const struct pcap_pkthdr *, const u_char *);
+static void dump_packet_and_trunc(u_char *, const struct pcap_pkthdr *, const u_char *);
+static void dump_packet(u_char *, const struct pcap_pkthdr *, const u_char *);
 
 #ifdef SIGINFO
 RETSIGTYPE requestinfo(int);
@@ -174,6 +175,15 @@ static struct printer printers[] = {
 #endif
 #ifdef DLT_SUNATM
        { sunatm_if_print,      DLT_SUNATM },
+#endif
+#ifdef DLT_IP_OVER_FC
+       { ipfc_if_print,        DLT_IP_OVER_FC },
+#endif
+#ifdef DLT_PRISM_HEADER
+       { prism_if_print,       DLT_PRISM_HEADER },
+#endif
+#ifdef DLT_IEEE802_11_RADIO
+       { ieee802_11_radio_if_print,    DLT_IEEE802_11_RADIO },
 #endif
        { NULL,                 0 },
 };
@@ -475,12 +485,17 @@ main(int argc, char **argv)
                        ++Xflag;
                        break;
 
-#ifdef YYDEBUG
+#if defined(HAVE_PCAP_DEBUG) || defined(HAVE_YYDEBUG)
                case 'Y':
                        {
                        /* Undocumented flag */
+#ifdef HAVE_PCAP_DEBUG
+                       extern int pcap_debug;
+                       pcap_debug = 1;
+#else
                        extern int yydebug;
                        yydebug = 1;
+#endif
                        }
                        break;
 #endif
@@ -579,22 +594,22 @@ main(int argc, char **argv)
                if (p == NULL)
                        error("%s", pcap_geterr(pd));
                if (Cflag != 0) {
-                       printer = dump_and_trunc;
+                       printer = dump_packet_and_trunc;
                        dumpinfo.WFileName = WFileName;
                        dumpinfo.pd = pd;
                        dumpinfo.p = p;
                        pcap_userdata = (u_char *)&dumpinfo;
                } else {
-                       printer = pcap_dump;
+                       printer = dump_packet;
                        pcap_userdata = (u_char *)p;
                }
        } else {
                printer = lookup_printer(pcap_datalink(pd));
                pcap_userdata = 0;
+       }
 #ifdef SIGINFO
-               (void)setsignal(SIGINFO, requestinfo);
+       (void)setsignal(SIGINFO, requestinfo);
 #endif
-       }
 #ifndef WIN32
        if (RFileName == NULL) {
                (void)fprintf(stderr, "%s: listening on %s\n",
@@ -680,34 +695,52 @@ swebitoa(unsigned int n, char *s)
 }
 
 static void
-dump_and_trunc(u_char *user, const struct pcap_pkthdr *h, const u_char *sp)
+dump_packet_and_trunc(u_char *user, const struct pcap_pkthdr *h, const u_char *sp)
 {
-       struct dump_info *info;
+       struct dump_info *dump_info;
        static uint cnt = 2;
        char *name;
 
-       info = (struct dump_info *)user;
+       ++infodelay;
+
+       dump_info = (struct dump_info *)user;
 
        /*
         * XXX - this won't prevent capture files from getting
         * larger than Cflag - the last packet written to the
         * file could put it over Cflag.
         */
-       if (ftell((FILE *)info->p) > Cflag) {
-               name = (char *) malloc(strlen(info->WFileName) + 4);
+       if (ftell((FILE *)dump_info->p) > Cflag) {
+               name = (char *) malloc(strlen(dump_info->WFileName) + 4);
                if (name == NULL)
-                       error("dump_and_trunc: malloc");
-               strcpy(name, info->WFileName);
-               swebitoa(cnt, name + strlen(info->WFileName));
+                       error("dump_packet_and_trunc: malloc");
+               strcpy(name, dump_info->WFileName);
+               swebitoa(cnt, name + strlen(dump_info->WFileName));
                cnt++;
-               pcap_dump_close(info->p);
-               info->p = pcap_dump_open(info->pd, name);
+               pcap_dump_close(dump_info->p);
+               dump_info->p = pcap_dump_open(dump_info->pd, name);
                free(name);
-               if (info->p == NULL)
+               if (dump_info->p == NULL)
                        error("%s", pcap_geterr(pd));
        }
 
-       pcap_dump((u_char *)info->p, h, sp);
+       pcap_dump((u_char *)dump_info->p, h, sp);
+
+       --infodelay;
+       if (infoprint)
+               info(0);
+}
+
+static void
+dump_packet(u_char *user, const struct pcap_pkthdr *h, const u_char *sp)
+{
+       ++infodelay;
+
+       pcap_dump(user, h, sp);
+
+       --infodelay;
+       if (infoprint)
+               info(0);
 }
 
 /* Like default_print() but data need not be aligned */
@@ -771,7 +804,7 @@ default_print(register const u_char *bp, register u_int length)
 }
 
 #ifdef SIGINFO
-RETSIGTYPE requestinfo(int signo)
+RETSIGTYPE requestinfo(int signo _U_)
 {
        if (infodelay)
                ++infoprint;
@@ -784,7 +817,11 @@ static void
 usage(void)
 {
        extern char version[];
+#if defined(WIN32) || defined(HAVE_PCAP_VERSION)
        extern char pcap_version[];
+#else
+       static char pcap_version[] = "unknown";
+#endif
 
 #ifdef WIN32
        (void)fprintf(stderr, "%s version %s, based on tcpdump version %s\n", program_name, WDversion, version);