Merge branch 'master' of git+ssh://bpf.tcpdump.org/tcpdump/master/git/tcpdump

[tcpdump] / tcpdump.c

diff --git a/tcpdump.c b/tcpdump.c
index 9e96daf9c33346994515115e6775d09fc5e6ce62..63e85aed10f06d56019aaced5e458deae7bbc561 100644 (file)
--- a/tcpdump.c
+++ b/tcpdump.c
@@ -106,7 +106,7 @@ static int Lflag;                   /* list available data link types and exit */
 static int Jflag;                      /* list available time stamp types */
 #endif
 #ifdef HAVE_PCAP_SETDIRECTION
-int Pflag = -1;        /* Restrict captured packet by sent/receive direction */
+int Qflag = -1;                                /* restrict captured packet by send/receive direction */
 #endif
 static char *zflag = NULL;             /* compress each savefile using a specified command (like gzip or bzip2) */
 
@@ -167,7 +167,7 @@ struct ndo_printer {
 };
 
 
-static struct printer printers[] = {
+static const struct printer printers[] = {
        { arcnet_if_print,      DLT_ARCNET },
 #ifdef DLT_ARCNET_LINUX
        { arcnet_linux_if_print, DLT_ARCNET_LINUX },
@@ -322,7 +322,7 @@ static struct printer printers[] = {
        { NULL,                 0 },
 };
 
-static struct ndo_printer ndo_printers[] = {
+static const struct ndo_printer ndo_printers[] = {
        { ether_if_print,       DLT_EN10MB },
 #ifdef DLT_IPNET
        { ipnet_if_print,       DLT_IPNET },
@@ -351,7 +351,7 @@ static struct ndo_printer ndo_printers[] = {
 if_printer
 lookup_printer(int type)
 {
-       struct printer *p;
+       const struct printer *p;
 
        for (p = printers; p->f; ++p)
                if (type == p->type)
@@ -364,7 +364,7 @@ lookup_printer(int type)
 if_ndo_printer
 lookup_ndo_printer(int type)
 {
-       struct ndo_printer *p;
+       const struct ndo_printer *p;
 
        for (p = ndo_printers; p->f; ++p)
                if (type == p->type)
@@ -532,9 +532,9 @@ show_dlts_and_exit(const char *device, pcap_t *pd)
 #endif
 
 #ifdef HAVE_PCAP_SETDIRECTION
-#define P_FLAG "P:"
+#define Q_FLAG "Q:"
 #else
-#define P_FLAG
+#define Q_FLAG
 #endif
 
 #ifndef WIN32
@@ -548,7 +548,7 @@ droproot(const char *username, const char *chroot_dir)
                fprintf(stderr, "tcpdump: Chroot without dropping root is insecure\n");
                exit(1);
        }
-       
+
        pw = getpwnam(username);
        if (pw) {
                if (chroot_dir) {
@@ -574,7 +574,7 @@ droproot(const char *username, const char *chroot_dir)
                if (initgroups(pw->pw_name, pw->pw_gid) != 0 ||
                    setgid(pw->pw_gid) != 0 || setuid(pw->pw_uid) != 0) {
                        fprintf(stderr, "tcpdump: Couldn't change to '%.32s' uid=%lu gid=%lu: %s\n",
-                           username, 
+                           username,
                            (unsigned long)pw->pw_uid,
                            (unsigned long)pw->pw_gid,
                            pcap_strerror(errno));
@@ -641,7 +641,7 @@ MakeFilename(char *buffer, char *orig_name, int cnt, int max_chars)
 static int tcpdump_printf(netdissect_options *ndo _U_,
                          const char *fmt, ...)
 {
-  
+
   va_list args;
   int ret;
 
@@ -733,7 +733,7 @@ main(int argc, char **argv)
        gndo->ndo_error=ndo_error;
        gndo->ndo_warning=ndo_warning;
        gndo->ndo_snaplen = DEFAULT_SNAPLEN;
-  
+
        cnt = -1;
        device = NULL;
        infile = NULL;
@@ -755,7 +755,7 @@ main(int argc, char **argv)
 #endif
 
        while (
-           (op = getopt(argc, argv, "aAb" B_FLAG "c:C:d" D_FLAG "eE:fF:G:hHi:" I_FLAG j_FLAG J_FLAG "KlLm:M:nNOp" P_FLAG "qr:Rs:StT:u" U_FLAG "vV:w:W:xXy:Yz:Z:")) != -1)
+           (op = getopt(argc, argv, "aAb" B_FLAG "c:C:d" D_FLAG "eE:fF:G:hHi:" I_FLAG j_FLAG J_FLAG "KlLm:M:nNOpq" Q_FLAG "r:Rs:StT:u" U_FLAG "vV:w:W:xXy:Yz:Z:")) != -1)
                switch (op) {
 
                case 'a':
@@ -859,7 +859,7 @@ main(int argc, char **argv)
                case 'i':
                        if (optarg[0] == '0' && optarg[1] == 0)
                                error("Invalid adapter index");
-                       
+
 #ifdef HAVE_PCAP_FINDALLDEVS
                        /*
                         * If the argument is a number, treat it as
@@ -977,22 +977,24 @@ main(int argc, char **argv)
                case 'p':
                        ++pflag;
                        break;
+
+               case 'q':
+                       ++qflag;
+                       ++suppress_default_print;
+                       break;
+
 #ifdef HAVE_PCAP_SETDIRECTION
-               case 'P':
+               case 'Q':
                        if (strcasecmp(optarg, "in") == 0)
-                               Pflag = PCAP_D_IN;
+                               Qflag = PCAP_D_IN;
                        else if (strcasecmp(optarg, "out") == 0)
-                               Pflag = PCAP_D_OUT;
+                               Qflag = PCAP_D_OUT;
                        else if (strcasecmp(optarg, "inout") == 0)
-                               Pflag = PCAP_D_INOUT;
+                               Qflag = PCAP_D_INOUT;
                        else
                                error("unknown capture direction `%s'", optarg);
                        break;
 #endif /* HAVE_PCAP_SETDIRECTION */
-               case 'q':
-                       ++qflag;
-                       ++suppress_default_print;
-                       break;
 
                case 'r':
                        RFileName = optarg;
@@ -1080,7 +1082,7 @@ main(int argc, char **argv)
 
                case 'W':
                        Wflag = atoi(optarg);
-                       if (Wflag < 0) 
+                       if (Wflag < 0)
                                error("invalid number of output files %s", optarg);
                        WflagChars = getWflagChars(Wflag);
                        break;
@@ -1177,7 +1179,7 @@ main(int argc, char **argv)
 #ifdef WITH_USER
        /* if run as root, prepare for dropping root privileges */
        if (getuid() == 0 || geteuid() == 0) {
-               /* Run with '-Z root' to restore old behaviour */ 
+               /* Run with '-Z root' to restore old behaviour */
                if (!username)
                        username = WITH_USER;
        }
@@ -1260,7 +1262,7 @@ main(int argc, char **argv)
                        fprintf(stderr, "%s: listening on %s\n", program_name, device);
                }
 
-               fflush(stderr); 
+               fflush(stderr);
 #endif /* WIN32 */
 #ifdef HAVE_PCAP_CREATE
                pd = pcap_create(device, ebuf);
@@ -1342,13 +1344,13 @@ main(int argc, char **argv)
                                    pcap_statustostr(status));
                }
 #ifdef HAVE_PCAP_SETDIRECTION
-               if (Pflag != -1) {
-                       status = pcap_setdirection(pd, Pflag);
+               if (Qflag != -1) {
+                       status = pcap_setdirection(pd, Qflag);
                        if (status != 0)
                                error("%s: pcap_setdirection() failed: %s",
                                      device,  pcap_geterr(pd));
                }
-#endif
+#endif /* HAVE_PCAP_SETDIRECTION */
 #else
                *ebuf = '\0';
                pd = pcap_open_live(device, snaplen, !pflag, 1000, ebuf);
@@ -1418,7 +1420,7 @@ main(int argc, char **argv)
        init_addrtoname(localnet, netmask);
         init_checksum();
 
-#ifndef WIN32  
+#ifndef WIN32
        (void)setsignal(SIGPIPE, cleanup);
        (void)setsignal(SIGTERM, cleanup);
        (void)setsignal(SIGINT, cleanup);
@@ -1427,7 +1429,7 @@ main(int argc, char **argv)
        (void)setsignal(SIGCHLD, child_cleanup);
 #endif
        /* Cooperate with nohup(1) */
-#ifndef WIN32  
+#ifndef WIN32
        if ((oldhandler = setsignal(SIGHUP, cleanup)) != SIG_DFL)
                (void)setsignal(SIGHUP, oldhandler);
 #endif /* WIN32 */
@@ -1939,6 +1941,7 @@ print_packet(u_char *user, const struct pcap_pkthdr *h, const u_char *sp)
 {
        struct print_info *print_info;
        u_int hdrlen;
+        netdissect_options *ndo;
 
        ++packets_captured;
 
@@ -1946,25 +1949,26 @@ print_packet(u_char *user, const struct pcap_pkthdr *h, const u_char *sp)
        ts_print(&h->ts);
 
        print_info = (struct print_info *)user;
+        ndo = print_info->ndo;
 
        /*
         * Some printers want to check that they're not walking off the
         * end of the packet.
         * Rather than pass it all the way down, we set this global.
         */
-       snapend = sp + h->caplen;
+       ndo->ndo_snapend = sp + h->caplen;
 
         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) {
+
+       if (ndo->ndo_Xflag) {
                /*
                 * Print the raw packet data in hex and ASCII.
                 */
-               if (Xflag > 1) {
+               if (ndo->ndo_Xflag > 1) {
                        /*
                         * Include the link-layer header.
                         */
@@ -1979,15 +1983,15 @@ print_packet(u_char *user, const struct pcap_pkthdr *h, const u_char *sp)
                                hex_and_ascii_print("\n\t", sp + hdrlen,
                                    h->caplen - hdrlen);
                }
-       } else if (xflag) {
+       } else if (ndo->ndo_xflag) {
                /*
                 * Print the raw packet data in hex.
                 */
-               if (xflag > 1) {
+               if (ndo->ndo_xflag > 1) {
                        /*
                         * Include the link-layer header.
                         */
-                       hex_print("\n\t", sp, h->caplen);
+                        hex_print(ndo, "\n\t", sp, h->caplen);
                } else {
                        /*
                         * Don't include the link-layer header - and if
@@ -1995,14 +1999,14 @@ print_packet(u_char *user, const struct pcap_pkthdr *h, const u_char *sp)
                         * print nothing.
                         */
                        if (h->caplen > hdrlen)
-                               hex_print("\n\t", sp + hdrlen,
-                                   h->caplen - hdrlen);
+                               hex_print(ndo, "\n\t", sp + hdrlen,
+                                          h->caplen - hdrlen);
                }
-       } else if (Aflag) {
+       } else if (ndo->ndo_Aflag) {
                /*
                 * Print the raw packet data in ASCII.
                 */
-               if (Aflag > 1) {
+               if (ndo->ndo_Aflag > 1) {
                        /*
                         * Include the link-layer header.
                         */
@@ -2136,7 +2140,7 @@ usage(void)
 "\t\t[ -i interface ]" j_FLAG_USAGE " [ -M secret ]\n");
 #ifdef HAVE_PCAP_SETDIRECTION
        (void)fprintf(stderr,
-"\t\t[ -P in|out|inout ]\n");
+"\t\t[ -Q in|out|inout ]\n");
 #endif
        (void)fprintf(stderr,
 "\t\t[ -r file ] [ -s snaplen ] [ -T type ] [ -V file ] [ -w file ]\n");
@@ -2184,3 +2188,9 @@ ndo_warning(netdissect_options *ndo _U_, const char *fmt, ...)
                        (void)fputc('\n', stderr);
        }
 }
+/*
+ * Local Variables:
+ * c-style: whitesmith
+ * c-basic-offset: 8
+ * End:
+ */