More UNALIGNED_MEM{CPY,CMP} on IP addresses.

[tcpdump] / print-cnfp.c

diff --git a/print-cnfp.c b/print-cnfp.c
index 5cc199810d88047fb033f7fa5b2752578bd76e96..79ca98199a43cb46a6122fbce4e1a16a73439b54 100644 (file)
--- a/print-cnfp.c
+++ b/print-cnfp.c
@@ -32,11 +32,6 @@
 
 /* Cisco NetFlow protocol */
 
-#ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-cnfp.c,v 1.14 2003-06-07 11:57:52 guy Exp $";
-#endif
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -79,16 +74,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)
@@ -96,8 +91,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,