Make it clearer that the hex or hex-and-ASCII dump for "-x", "-xx",

[tcpdump] / print-cnfp.c

diff --git a/print-cnfp.c b/print-cnfp.c
index 2fe76b629c5c5a8c3d6840e3d23eba4f32657dfc..6270a077904911a6e86e7cd37c46337886f96101 100644 (file)
--- a/print-cnfp.c
+++ b/print-cnfp.c
@@ -33,8 +33,8 @@
 /* Cisco NetFlow protocol */
 
 #ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-cnfp.c,v 1.13 2002-12-11 07:13:58 guy Exp $";
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/tcpdump/print-cnfp.c,v 1.16.2.1 2005-04-20 20:53:39 guy Exp $";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -51,6 +51,7 @@ static const char rcsid[] =
 #include "extract.h"
 
 #include "tcp.h"
+#include "ipproto.h"
 
 struct nfhdr {
        u_int32_t       ver_cnt;        /* version [15], and # of records */
@@ -78,16 +79,16 @@ struct nfrec {
 };
 
 void
-cnfp_print(const u_char *cp, const u_char *bp)
+cnfp_print(const u_char *cp, const u_char *bp _U_)
 {
        register const struct nfhdr *nh;
        register const struct nfrec *nr;
-       register const struct ip *ip;
        struct protoent *pent;
        int nrecs, ver;
+#if 0
        time_t t;
+#endif
 
-       ip = (const struct ip *)bp;
        nh = (const struct nfhdr *)cp;
 
        if ((const u_char *)(nh + 1) > snapend)
@@ -95,8 +96,14 @@ cnfp_print(const u_char *cp, const u_char *bp)
 
        nrecs = EXTRACT_32BITS(&nh->ver_cnt) & 0xffff;
        ver = (EXTRACT_32BITS(&nh->ver_cnt) & 0xffff0000) >> 16;
+#if 0
+       /*
+        * This is seconds since the UN*X epoch, and is followed by
+        * nanoseconds.  XXX - format it, rather than just dumping the
+        * raw seconds-since-the-Epoch.
+        */
        t = EXTRACT_32BITS(&nh->utc_sec);
-/*     (p = ctime(&t))[24] = '\0'; */
+#endif
 
        printf("NetFlow v%x, %u.%03u uptime, %u.%09u, ", ver,
               EXTRACT_32BITS(&nh->msys_uptime)/1000,