From: Juergen Schoenwaelder <[email protected]>

[tcpdump] / tcpdump.c

diff --git a/tcpdump.c b/tcpdump.c
index f04061d4ce8c720a6ad2e346e87daa3b93b3cc18..f331cf8ca0af592bad29815d2dc4c44730504269 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.129 1999-10-07 23:47:13 mcr Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/tcpdump.c,v 1.136 1999-12-13 18:06:15 mcr Exp $ (LBL)";
 #endif
 
 /*
@@ -35,6 +35,10 @@ static const char rcsid[] =
  * combined efforts of Van, Steve McCanne and Craig Leres of LBL.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <sys/types.h>
 #include <sys/time.h>
 
@@ -47,6 +51,9 @@ static const char rcsid[] =
 #include <string.h>
 #include <unistd.h>
 
+#include <netinet/in_systm.h>
+#include <netinet/ip.h>
+
 #include "interface.h"
 #include "addrtoname.h"
 #include "machdep.h"
@@ -62,11 +69,16 @@ int Nflag;                  /* remove domains from printed host names */
 int Oflag = 1;                 /* run filter code optimizer */
 int pflag;                     /* don't go promiscuous */
 int qflag;                     /* quick (shorter) output */
+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 vflag;                     /* verbose */
 int xflag;                     /* print packet in hex */
 
+char *ahsecret = NULL;         /* AH secret key */
+char *espsecret = NULL;                /* ESP secret key */
+
 int packettype;
 
 
@@ -92,6 +104,12 @@ struct printer {
 static struct printer printers[] = {
        { ether_if_print,       DLT_EN10MB },
        { ether_if_print,       DLT_IEEE802 },
+#ifdef DLT_LANE8023
+       { lane_if_print,        DLT_LANE8023 },
+#endif
+#ifdef DLT_CIP
+       { cip_if_print,         DLT_CIP },
+#endif
        { sl_if_print,          DLT_SLIP },
        { sl_bsdos_if_print,    DLT_SLIP_BSDOS },
        { ppp_if_print,         DLT_PPP },
@@ -100,6 +118,9 @@ static struct printer printers[] = {
        { null_if_print,        DLT_NULL },
        { raw_if_print,         DLT_RAW },
        { atm_if_print,         DLT_ATM_RFC1483 },
+#ifdef DLT_CHDLC
+       { chdlc_if_print,       DLT_CHDLC },
+#endif
        { NULL,                 0 },
 };
 
@@ -147,15 +168,28 @@ main(int argc, char **argv)
        if (abort_on_misalignment(ebuf) < 0)
                error("%s", ebuf);
 
+#ifdef LIBSMI
+       smiInit("tcpdump");
+#endif
+       
        opterr = 0;
        while (
-           (op = getopt(argc, argv, "ac:defF:i:lnNOpqr:s:StT:vw:xY")) != EOF)
+           (op = getopt(argc, argv, "ac:deE:fF:i:lnNm:Opqr:Rs:StT:vw:xY")) != EOF)
                switch (op) {
 
                case 'a':
                        ++aflag;
                        break;
 
+#if 0
+               case 'A':
+#ifndef CRYPTO
+                       warning("crypto code not compiled in");
+#endif
+                       ahsecret = optarg;
+                       break;
+#endif
+
                case 'c':
                        cnt = atoi(optarg);
                        if (cnt <= 0)
@@ -170,6 +204,13 @@ main(int argc, char **argv)
                        ++eflag;
                        break;
 
+               case 'E':
+#ifndef CRYPTO
+                       warning("crypto code not compiled in");
+#endif
+                       espsecret = optarg;
+                       break;
+
                case 'f':
                        ++fflag;
                        break;
@@ -198,6 +239,18 @@ main(int argc, char **argv)
                        ++Nflag;
                        break;
 
+               case 'm':
+#ifdef LIBSMI
+                       if (smiLoadModule(optarg) == 0) {
+                               error("could not load MIB module %s", optarg);
+                       }
+                       sflag = 1;
+#else
+                       (void)fprintf(stderr, "%s: ignoring option `-m %s' ",
+                                     program_name, optarg);
+                       (void)fprintf(stderr, "(no libsmi support)\n");
+#endif
+                       
                case 'O':
                        Oflag = 0;
                        break;
@@ -214,6 +267,10 @@ main(int argc, char **argv)
                        RFileName = optarg;
                        break;
 
+               case 'R':
+                       Rflag = 0;
+                       break;
+
                case 's':
                        snaplen = atoi(optarg);
                        if (snaplen <= 0)
@@ -239,6 +296,8 @@ main(int argc, char **argv)
                                packettype = PT_RTP;
                        else if (strcasecmp(optarg, "rtcp") == 0)
                                packettype = PT_RTCP;
+                       else if (strcasecmp(optarg, "snmp") == 0)
+                               packettype = PT_SNMP;
                        else
                                error("unknown packet type `%s'", optarg);
                        break;
@@ -385,22 +444,42 @@ cleanup(int signo)
 void
 default_print_unaligned(register const u_char *cp, register u_int length)
 {
-       register u_int i, s;
-       register int nshorts;
-
-       nshorts = (u_int) length / sizeof(u_short);
-       i = 0;
-       while (--nshorts >= 0) {
-               if ((i++ % 8) == 0)
-                       (void)printf("\n\t\t\t");
-               s = *cp++;
-               (void)printf(" %02x%02x", s, *cp++);
-       }
-       if (length & 1) {
-               if ((i % 8) == 0)
-                       (void)printf("\n\t\t\t");
-               (void)printf(" %02x", *cp);
-       }
+  register u_int i, s;
+  register int nshorts;
+
+  char line[81];
+  
+  nshorts = (u_int) length / sizeof(u_short);
+  i = 0;
+  memset(line, ' ', 80);
+  line[81]='\0';
+
+  putchar('\n');
+  while (nshorts >= 0) {
+    
+    sprintf(line+20+i*5, "%02x%02x  ", cp[0], cp[1]);
+
+    if(isprint(cp[0])) {
+      line[62+i*2]=cp[0];
+    } else {
+      line[62+i*2]='.';
+    }
+    if(isprint(cp[1])) {
+      line[62+i*2+1]=cp[1];
+    } else {
+      line[62+i*2+1]='.';
+    }
+    i++;
+    if (i == 8) {
+      line[60]=' ';
+      line[61]=' ';
+      line[62+16]='\0';
+      puts(line);
+      i=0;
+    }
+    cp += 2;
+    nshorts--;
+  }
 }
 
 /*
@@ -415,23 +494,7 @@ default_print(register const u_char *bp, register u_int length)
        register u_int i;
        register int nshorts;
 
-       if ((long)bp & 1) {
-               default_print_unaligned(bp, length);
-               return;
-       }
-       sp = (u_short *)bp;
-       nshorts = (u_int) length / sizeof(u_short);
-       i = 0;
-       while (--nshorts >= 0) {
-               if ((i++ % 8) == 0)
-                       (void)printf("\n\t\t\t");
-               (void)printf(" %04x", ntohs(*sp++));
-       }
-       if (length & 1) {
-               if ((i % 8) == 0)
-                       (void)printf("\n\t\t\t");
-               (void)printf(" %02x", *(u_char *)sp);
-       }
+       default_print_unaligned(bp, length);
 }
 
 __dead void