Make the port arguments to udpipaddr_print() ints so that there can be

[tcpdump] / tcpdump.c

diff --git a/tcpdump.c b/tcpdump.c
index d340c43c886d6dd8f267d43aab6ffd0ed3cd7be7..a83be5deb1b2537747502ff78ea2f907d99d547b 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.210 2003-07-30 05:51:40 guy Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/tcpdump.c,v 1.211 2003-07-31 22:36:43 fenner Exp $ (LBL)";
 #endif
 
 /*
@@ -69,7 +69,6 @@ extern int SIZE_BUF;
 #include "gmt2local.h"
 #include "pcap-missing.h"
 
-int aflag;                     /* translate network and broadcast addresses */
 int dflag;                     /* print filter code */
 int eflag;                     /* print ethernet header */
 int fflag;                     /* don't translate "foreign" IP address */
@@ -352,7 +351,7 @@ main(int argc, char **argv)
                switch (op) {
 
                case 'a':
-                       ++aflag;
+                       /* compatibility for old -a */
                        break;
 
                case 'A':
@@ -601,9 +600,6 @@ main(int argc, char **argv)
                        /* NOTREACHED */
                }
 
-       if (aflag && nflag)
-               error("-a and -n options are incompatible");
-
        if (tflag > 0)
                thiszone = gmt2local(0);