try fetch names from CVS logs and adding here

[tcpdump] / tcpdump.c

diff --git a/tcpdump.c b/tcpdump.c
index 8384218dccb04fb73f23ffdb7691b6b99d14a45c..9915901939d7320b4ad07f339cd1183548035c66 100644 (file)
--- a/tcpdump.c
+++ b/tcpdump.c
@@ -24,7 +24,7 @@ static const char copyright[] =
     "@(#) Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997\n\
 The Regents of the University of California.  All rights reserved.\n";
 static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/tcpdump.c,v 1.142 2000-01-17 06:24:27 itojun Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/tcpdump.c,v 1.150 2000-07-25 05:28:12 guy Exp $ (LBL)";
 #endif
 
 /*
@@ -74,6 +74,7 @@ int Rflag = 1;                        /* print sequence # field in AH/ESP*/
 int sflag = 0;                 /* use the libsmi to translate OIDs */
 int Sflag;                     /* print raw TCP sequence numbers */
 int tflag = 1;                 /* print packet arrival time */
+int uflag = 0;                 /* Print undecoded NFS handles */
 int vflag;                     /* verbose */
 int xflag;                     /* print packet in hex */
 int Xflag;                     /* print packet in ascii as well as hex */
@@ -87,12 +88,9 @@ char *program_name;
 
 int32_t thiszone;              /* seconds offset from gmt to local time */
 
-/* Externs */
-extern void bpf_dump(struct bpf_program *, int);
-
 /* Forwards */
-RETSIGTYPE cleanup(int);
-extern __dead void usage(void) __attribute__((volatile));
+static RETSIGTYPE cleanup(int);
+static void usage(void) __attribute__((noreturn));
 
 /* Length of saved portion of packet. */
 int snaplen = DEFAULT_SNAPLEN;
@@ -104,7 +102,7 @@ struct printer {
 
 static struct printer printers[] = {
        { ether_if_print,       DLT_EN10MB },
-       { ether_if_print,       DLT_IEEE802 },
+       { token_if_print,       DLT_IEEE802 },
 #ifdef DLT_LANE8023
        { lane_if_print,        DLT_LANE8023 },
 #endif
@@ -175,7 +173,7 @@ main(int argc, char **argv)
        
        opterr = 0;
        while (
-           (op = getopt(argc, argv, "ac:deE:fF:i:lnNm:Opqr:Rs:StT:vw:xXY")) != EOF)
+           (op = getopt(argc, argv, "ac:deE:fF:i:lm:nNOpqr:Rs:StT:uvw:xXY")) != -1)
                switch (op) {
 
                case 'a':
@@ -263,11 +261,17 @@ main(int argc, char **argv)
                        Rflag = 0;
                        break;
 
-               case 's':
-                       snaplen = atoi(optarg);
-                       if (snaplen <= 0)
+               case 's': {
+                       char *end;
+
+                       snaplen = strtol(optarg, &end, 0);
+                       if (optarg == end || *end != '\0'
+                           || snaplen < 0 || snaplen > 65535)
                                error("invalid snaplen %s", optarg);
+                       else if (snaplen == 0)
+                               snaplen = 65535;
                        break;
+               }
 
                case 'S':
                        ++Sflag;
@@ -290,10 +294,16 @@ main(int argc, char **argv)
                                packettype = PT_RTCP;
                        else if (strcasecmp(optarg, "snmp") == 0)
                                packettype = PT_SNMP;
+                       else if (strcasecmp(optarg, "cnfp") == 0)
+                               packettype = PT_CNFP;
                        else
                                error("unknown packet type `%s'", optarg);
                        break;
 
+               case 'u':
+                       ++uflag;
+                       break;
+                       
                case 'v':
                        ++vflag;
                        break;
@@ -416,7 +426,7 @@ main(int argc, char **argv)
 }
 
 /* make a clean exit on interrupts */
-RETSIGTYPE
+static RETSIGTYPE
 cleanup(int signo)
 {
        struct pcap_stat stat;
@@ -470,10 +480,10 @@ default_print_unaligned(register const u_char *cp, register u_int length)
 void
 default_print(register const u_char *bp, register u_int length)
 {
-  default_print_unaligned(bp, length);
+       default_print_unaligned(bp, length);
 }
 
-__dead void
+static void
 usage(void)
 {
        extern char version[];
@@ -482,7 +492,7 @@ usage(void)
        (void)fprintf(stderr, "%s version %s\n", program_name, version);
        (void)fprintf(stderr, "libpcap version %s\n", pcap_version);
        (void)fprintf(stderr,
-"Usage: %s [-adeflnNOpqStvxX] [-c count] [ -F file ]\n", program_name);
+"Usage: %s [-adeflnNOpqStuvxX] [-c count] [ -F file ]\n", program_name);
        (void)fprintf(stderr,
 "\t\t[ -i interface ] [ -r file ] [ -s snaplen ]\n");
        (void)fprintf(stderr,