There's no link-layer header on Linux ARPHRD_ATM packets; there's

[tcpdump] / print-cnfp.c

diff --git a/print-cnfp.c b/print-cnfp.c
index 34baf8a366a50ea8508151643f3b1d59fc8b46f7..5f9d1a3cf54f1e303acd614b851503c8263c7fab 100644 (file)
--- a/print-cnfp.c
+++ b/print-cnfp.c
@@ -34,7 +34,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-cnfp.c,v 1.3 2000-04-27 13:45:11 itojun Exp $";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-cnfp.c,v 1.8 2001-09-17 21:57:58 fenner Exp $";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -47,13 +47,16 @@ static const char rcsid[] =
 #include <netdb.h>
 
 #include <netinet/in.h>
-#include <netinet/tcp.h>
+
+#include <arpa/inet.h>
 
 #include <stdio.h>
 #include <string.h>
 
 #include "interface.h"
 
+#include "tcp.h"
+
 struct nfhdr {
        u_int32_t       ver_cnt;        /* version [15], and # of records */
        u_int32_t       msys_uptime;
@@ -75,8 +78,8 @@ struct nfrec {
        u_int32_t       ports;          /* src,dst ports */
        u_int32_t       proto_tos;      /* proto, tos, pad, flags(v5) */
        u_int32_t       asses;          /* v1: flags; v5: src,dst AS */
-       u_int32_t       masks;          /* src,dst addr prefix */
-
+       u_int32_t       masks;          /* src,dst addr prefix; v6: encaps */
+       struct in_addr  peer_nexthop;   /* v6: IP address of the nexthop within the peer (FIB)*/
 };
 
 void
@@ -88,12 +91,11 @@ cnfp_print(const u_char *cp, u_int len, const u_char *bp)
        struct protoent *pent;
        int nrecs, ver;
        time_t t;
-       char *p;
 
-       ip = (struct ip *)bp;
-       nh = (struct nfhdr *)cp;
+       ip = (const struct ip *)bp;
+       nh = (const struct nfhdr *)cp;
 
-       if ((u_char *)(nh + 1) > snapend)
+       if ((const u_char *)(nh + 1) > snapend)
                return;
 
        nrecs = ntohl(nh->ver_cnt) & 0xffff;
@@ -102,48 +104,56 @@ cnfp_print(const u_char *cp, u_int len, const u_char *bp)
 /*     (p = ctime(&t))[24] = '\0'; */
 
        printf("NetFlow v%x, %u.%03u uptime, %u.%09u, ", ver,
-              ntohl(nh->msys_uptime)/1000, ntohl(nh->msys_uptime)%1000,
-              ntohl(nh->utc_sec), ntohl(nh->utc_nsec));
+              (unsigned)ntohl(nh->msys_uptime)/1000,
+              (unsigned)ntohl(nh->msys_uptime)%1000,
+              (unsigned)ntohl(nh->utc_sec), (unsigned)ntohl(nh->utc_nsec));
 
-       if (ver == 5) {
-               printf("#%u, ", htonl(nh->sequence));
-               nr = (struct nfrec *)&nh[1];
+       if (ver == 5 || ver == 6) {
+               printf("#%u, ", (unsigned)htonl(nh->sequence));
+               nr = (const struct nfrec *)&nh[1];
                snaplen -= 24;
        } else {
-               nr = (struct nfrec *)&nh->sequence;
+               nr = (const struct nfrec *)&nh->sequence;
                snaplen -= 16;
        }
 
        printf("%2u recs", nrecs);
 
-       for (; nrecs-- && (u_char *)(nr + 1) <= snapend; nr++) {
-               char buf[5];
-               char asbuf[7];
+       for (; nrecs-- && (const u_char *)(nr + 1) <= snapend; nr++) {
+               char buf[20];
+               char asbuf[20];
 
                printf("\n  started %u.%03u, last %u.%03u",
-                       ntohl(nr->start_time)/1000, ntohl(nr->start_time)%1000,
-                       ntohl(nr->last_time)/1000, ntohl(nr->last_time)%1000);
+                      (unsigned)ntohl(nr->start_time)/1000,
+                      (unsigned)ntohl(nr->start_time)%1000,
+                      (unsigned)ntohl(nr->last_time)/1000,
+                      (unsigned)ntohl(nr->last_time)%1000);
 
                asbuf[0] = buf[0] = '\0';
-               if (ver == 5) {
-                       sprintf(buf, "/%d", (ntohl(nr->masks) >> 24) & 0xff);
-                       sprintf(asbuf, "%d:", (ntohl(nr->asses) >> 16) & 0xffff);
+               if (ver == 5 || ver == 6) {
+                       snprintf(buf, sizeof(buf), "/%u",
+                                (unsigned)(ntohl(nr->masks) >> 24) & 0xff);
+                       snprintf(asbuf, sizeof(asbuf), ":%u",
+                                (unsigned)(ntohl(nr->asses) >> 16) & 0xffff);
                }
                printf("\n    %s%s%s:%u ", inet_ntoa(nr->src_ina), buf, asbuf,
-                       ntohl(nr->ports) >> 16);
+                       (unsigned)ntohl(nr->ports) >> 16);
 
-               if (ver == 5) {
-                       sprintf(buf, "/%d", (ntohl(nr->masks) >> 16) & 0xff);
-                       sprintf(asbuf, "%d:", ntohl(nr->asses) & 0xffff);
+               if (ver == 5 || ver ==6) {
+                       snprintf(buf, sizeof(buf), "/%d",
+                                (unsigned)(ntohl(nr->masks) >> 16) & 0xff);
+                       snprintf(asbuf, sizeof(asbuf), ":%u",
+                                (unsigned)ntohl(nr->asses) & 0xffff);
                }
                printf("> %s%s%s:%u ", inet_ntoa(nr->dst_ina), buf, asbuf,
-                       ntohl(nr->ports) & 0xffff);
+                       (unsigned)ntohl(nr->ports) & 0xffff);
 
                printf(">> %s\n    ", inet_ntoa(nr->nhop_ina));
 
                pent = getprotobynumber((ntohl(nr->proto_tos) >> 8) & 0xff);
                if (!pent || nflag)
-                       printf("%u ", (ntohl(nr->proto_tos) >> 8) & 0xff);
+                       printf("%u ",
+                              (unsigned)(ntohl(nr->proto_tos) >> 8) & 0xff);
                else
                        printf("%s ", pent->p_name);
 
@@ -163,11 +173,16 @@ cnfp_print(const u_char *cp, u_int len, const u_char *bp)
                        if (flags)
                                putchar(' ');
                }
-               printf("tos %u, %u (%u octets)", ntohl(nr->proto_tos) & 0xff,
-                       ntohl(nr->packets), ntohl(nr->octets));
-
 
+               buf[0]='\0';
+               if (ver == 6) {
+                       snprintf(buf, sizeof(buf), "(%u<>%u encaps)",
+                                (unsigned)(ntohl(nr->masks) >> 8) & 0xff,
+                                (unsigned)(ntohl(nr->masks)) & 0xff);
+               }
+               printf("tos %u, %u (%u octets) %s",
+                      (unsigned)ntohl(nr->proto_tos) & 0xff,
+                      (unsigned)ntohl(nr->packets),
+                      (unsigned)ntohl(nr->octets), buf);
        }
-
 }
-