add basic support for Ethernet OAM Frames as per 802.3ah

[tcpdump] / tcpdump.c

diff --git a/tcpdump.c b/tcpdump.c
index 8a9ac9d9f053c35d828803e7cd4fbcddf9607347..65e108a04f38f58455ee70d26a75023bd6ddd5be 100644 (file)
--- a/tcpdump.c
+++ b/tcpdump.c
@@ -30,7 +30,7 @@ static const char copyright[] _U_ =
     "@(#) 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[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/tcpdump.c,v 1.264 2005-12-05 20:24:48 guy Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/tcpdump.c,v 1.267 2006-02-09 20:33:49 hannes Exp $ (LBL)";
 #endif
 
 /*
@@ -260,6 +260,9 @@ static struct printer printers[] = {
 #endif
 #ifdef DLT_JUNIPER_CHDLC
        { juniper_chdlc_print, DLT_JUNIPER_CHDLC },
+#endif
+#ifdef DLT_MFR
+       { mfr_if_print, DLT_MFR },
 #endif
        { NULL,                 0 },
 };
@@ -834,10 +837,11 @@ main(int argc, char **argv)
        case 1: /* No time stamp */
        case 2: /* Unix timeval style */
        case 3: /* Microseconds since previous packet */
+        case 5: /* Microseconds since first packet */
                break;
 
        default: /* Not supported */
-               error("only -t, -tt, -ttt, and -tttt are supported");
+               error("only -t, -tt, -ttt, -tttt and -ttttt are supported");
                break;
        }
 
@@ -976,6 +980,7 @@ main(int argc, char **argv)
                exit(0);
        }
        init_addrtoname(localnet, netmask);
+        init_checksum();
 
 #ifndef WIN32  
        (void)setsignal(SIGPIPE, cleanup);