Fix spaces

[tcpdump] / print-cnfp.c

diff --git a/print-cnfp.c b/print-cnfp.c
index fcca21656f34bd046673bf803b663d49c2d0bc30..b06e27f0b0ce5ec7949d1716b2dfe62c879e03d0 100644 (file)
--- a/print-cnfp.c
+++ b/print-cnfp.c
@@ -30,145 +30,467 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 

-/* Cisco NetFlow protocol */
+/* \summary: Cisco NetFlow protocol printer */

 
 

-#ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-cnfp.c,v 1.4 2000-04-28 11:17:36 itojun Exp $";
-#endif
+/*
+ * Cisco NetFlow protocol
+ *
+ * See
+ *
+ *    http://www.cisco.com/c/en/us/td/docs/net_mgmt/netflow_collection_engine/3-6/user/guide/format.html#wp1005892
+ */

 
 #ifdef HAVE_CONFIG_H
 
 #ifdef HAVE_CONFIG_H

-#include "config.h"
+#include <config.h>

 #endif
 
 #endif
 

-#include <sys/types.h>
-#include <sys/time.h>
-#include <sys/socket.h>
-#include <netdb.h>
-
-#include <netinet/in.h>
-#include <netinet/tcp.h>
-
-#include <arpa/inet.h>
+#include "netdissect-stdinc.h"

 
 #include <stdio.h>
 #include <string.h>
 
 
 #include <stdio.h>
 #include <string.h>
 

-#include "interface.h"
+#include "netdissect.h"
+#include "addrtoname.h"
+#include "extract.h"
+
+#include "tcp.h"
+#include "ipproto.h"

 
 

-struct nfhdr {
-       u_int32_t       ver_cnt;        /* version [15], and # of records */
-       u_int32_t       msys_uptime;
-       u_int32_t       utc_sec;
-       u_int32_t       utc_nsec;
-       u_int32_t       sequence;       /* v5 flow sequence number */
-       u_int32_t       reserved;       /* v5 only */
+struct nfhdr_v1 {
+       nd_uint16_t     version;        /* version number */
+       nd_uint16_t     count;          /* # of records */
+       nd_uint32_t     msys_uptime;
+       nd_uint32_t     utc_sec;
+       nd_uint32_t     utc_nsec;

 };
 
 };
 

-struct nfrec {
-       struct in_addr  src_ina;
-       struct in_addr  dst_ina;
-       struct in_addr  nhop_ina;
-       u_int32_t       ifaces;         /* src,dst ifaces */
-       u_int32_t       packets;
-       u_int32_t       octets;
-       u_int32_t       start_time;     /* sys_uptime value */
-       u_int32_t       last_time;      /* sys_uptime value */
-       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 */
+struct nfrec_v1 {
+       nd_ipv4         src_ina;
+       nd_ipv4         dst_ina;
+       nd_ipv4         nhop_ina;
+       nd_uint16_t     input;          /* SNMP index of input interface */
+       nd_uint16_t     output;         /* SNMP index of output interface */
+       nd_uint32_t     packets;        /* packets in the flow */
+       nd_uint32_t     octets;         /* layer 3 octets in the packets of the flow */
+       nd_uint32_t     start_time;     /* sys_uptime value at start of flow */
+       nd_uint32_t     last_time;      /* sys_uptime value when last packet of flow was received */
+       nd_uint16_t     srcport;        /* TCP/UDP source port or equivalent */
+       nd_uint16_t     dstport;        /* TCP/UDP source port or equivalent */
+       nd_byte         pad1[2];        /* pad */
+       nd_uint8_t      proto;          /* IP protocol type */
+       nd_uint8_t      tos;            /* IP type of service */
+       nd_uint8_t      tcp_flags;      /* cumulative OR of TCP flags */
+       nd_byte         pad[3];         /* padding */
+       nd_uint32_t     reserved;       /* unused */
+};

 
 

+struct nfhdr_v5 {
+       nd_uint16_t     version;        /* version number */
+       nd_uint16_t     count;          /* # of records */
+       nd_uint32_t     msys_uptime;
+       nd_uint32_t     utc_sec;
+       nd_uint32_t     utc_nsec;
+       nd_uint32_t     sequence;       /* flow sequence number */
+       nd_uint8_t      engine_type;    /* type of flow-switching engine */
+       nd_uint8_t      engine_id;      /* slot number of the flow-switching engine */
+       nd_uint16_t     sampling_interval; /* sampling mode and interval */

 };
 
 };
 

-void
-cnfp_print(const u_char *cp, u_int len, const u_char *bp)
+struct nfrec_v5 {
+       nd_ipv4         src_ina;
+       nd_ipv4         dst_ina;
+       nd_ipv4         nhop_ina;
+       nd_uint16_t     input;          /* SNMP index of input interface */
+       nd_uint16_t     output;         /* SNMP index of output interface */
+       nd_uint32_t     packets;        /* packets in the flow */
+       nd_uint32_t     octets;         /* layer 3 octets in the packets of the flow */
+       nd_uint32_t     start_time;     /* sys_uptime value at start of flow */
+       nd_uint32_t     last_time;      /* sys_uptime value when last packet of flow was received */
+       nd_uint16_t     srcport;        /* TCP/UDP source port or equivalent */
+       nd_uint16_t     dstport;        /* TCP/UDP source port or equivalent */
+       nd_byte         pad1;           /* pad */
+       nd_uint8_t      tcp_flags;      /* cumulative OR of TCP flags */
+       nd_uint8_t      proto;          /* IP protocol type */
+       nd_uint8_t      tos;            /* IP type of service */
+       nd_uint16_t     src_as;         /* AS number of the source */
+       nd_uint16_t     dst_as;         /* AS number of the destination */
+       nd_uint8_t      src_mask;       /* source address mask bits */
+       nd_uint8_t      dst_mask;       /* destination address prefix mask bits */
+       nd_byte         pad2[2];
+       nd_ipv4         peer_nexthop;   /* v6: IP address of the nexthop within the peer (FIB)*/
+};
+
+struct nfhdr_v6 {
+       nd_uint16_t     version;        /* version number */
+       nd_uint16_t     count;          /* # of records */
+       nd_uint32_t     msys_uptime;
+       nd_uint32_t     utc_sec;
+       nd_uint32_t     utc_nsec;
+       nd_uint32_t     sequence;       /* v5 flow sequence number */
+       nd_uint32_t     reserved;       /* v5 only */
+};
+
+struct nfrec_v6 {
+       nd_ipv4         src_ina;
+       nd_ipv4         dst_ina;
+       nd_ipv4         nhop_ina;
+       nd_uint16_t     input;          /* SNMP index of input interface */
+       nd_uint16_t     output;         /* SNMP index of output interface */
+       nd_uint32_t     packets;        /* packets in the flow */
+       nd_uint32_t     octets;         /* layer 3 octets in the packets of the flow */
+       nd_uint32_t     start_time;     /* sys_uptime value at start of flow */
+       nd_uint32_t     last_time;      /* sys_uptime value when last packet of flow was received */
+       nd_uint16_t     srcport;        /* TCP/UDP source port or equivalent */
+       nd_uint16_t     dstport;        /* TCP/UDP source port or equivalent */
+       nd_byte         pad1;           /* pad */
+       nd_uint8_t      tcp_flags;      /* cumulative OR of TCP flags */
+       nd_uint8_t      proto;          /* IP protocol type */
+       nd_uint8_t      tos;            /* IP type of service */
+       nd_uint16_t     src_as;         /* AS number of the source */
+       nd_uint16_t     dst_as;         /* AS number of the destination */
+       nd_uint8_t      src_mask;       /* source address mask bits */
+       nd_uint8_t      dst_mask;       /* destination address prefix mask bits */
+       nd_uint16_t     flags;
+       nd_ipv4         peer_nexthop;   /* v6: IP address of the nexthop within the peer (FIB)*/
+};
+
+static void
+cnfp_v1_print(netdissect_options *ndo, const u_char *cp)

 {
 {

-       register const struct nfhdr *nh;
-       register const struct nfrec *nr;
-       register const struct ip *ip;
-       struct protoent *pent;
-       int nrecs, ver;
+       const struct nfhdr_v1 *nh;
+       const struct nfrec_v1 *nr;
+       const char *p_name;
+       uint8_t proto;
+       u_int nrecs, ver;
+#if 0

        time_t t;
        time_t t;

+#endif
+
+       nh = (const struct nfhdr_v1 *)cp;
+       ND_TCHECK_SIZE(nh);
+
+       ver = EXTRACT_BE_U_2(nh->version);
+       nrecs = EXTRACT_BE_U_4(nh->count);
+#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_BE_U_4(nh->utc_sec);
+#endif
+
+       ND_PRINT("NetFlow v%x, %u.%03u uptime, %u.%09u, ", ver,
+              EXTRACT_BE_U_4(nh->msys_uptime)/1000,
+              EXTRACT_BE_U_4(nh->msys_uptime)%1000,
+              EXTRACT_BE_U_4(nh->utc_sec), EXTRACT_BE_U_4(nh->utc_nsec));

 
 

-       ip = (struct ip *)bp;
-       nh = (struct nfhdr *)cp;
+       nr = (const struct nfrec_v1 *)&nh[1];

 
 

-       if ((u_char *)(nh + 1) > snapend)
-               return;
+       ND_PRINT("%2u recs", nrecs);

 
 

-       nrecs = ntohl(nh->ver_cnt) & 0xffff;
-       ver = (ntohl(nh->ver_cnt) & 0xffff0000) >> 16;
-       t = ntohl(nh->utc_sec);
-/*     (p = ctime(&t))[24] = '\0'; */
+       for (; nrecs != 0; nr++, nrecs--) {
+               char buf[20];
+               char asbuf[20];
+
+               /*
+                * Make sure we have the entire record.
+                */
+               ND_TCHECK_SIZE(nr);
+               ND_PRINT("\n  started %u.%03u, last %u.%03u",
+                      EXTRACT_BE_U_4(nr->start_time)/1000,
+                      EXTRACT_BE_U_4(nr->start_time)%1000,
+                      EXTRACT_BE_U_4(nr->last_time)/1000,
+                      EXTRACT_BE_U_4(nr->last_time)%1000);
+
+               asbuf[0] = buf[0] = '\0';
+               ND_PRINT("\n    %s%s%s:%u ",
+                       intoa(EXTRACT_IPV4_TO_NETWORK_ORDER(nr->src_ina)),
+                       buf, asbuf,
+                       EXTRACT_BE_U_2(nr->srcport));
+
+               ND_PRINT("> %s%s%s:%u ",
+                       intoa(EXTRACT_IPV4_TO_NETWORK_ORDER(nr->dst_ina)),
+                       buf, asbuf,
+                       EXTRACT_BE_U_2(nr->dstport));

 
 

-       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));
+               ND_PRINT(">> %s\n    ",
+                       intoa(EXTRACT_IPV4_TO_NETWORK_ORDER(nr->nhop_ina)));
+
+               proto = EXTRACT_U_1(nr->proto);
+               if (!ndo->ndo_nflag && (p_name = netdb_protoname(proto)) != NULL)
+                       ND_PRINT("%s ", p_name);
+               else
+                       ND_PRINT("%u ", proto);
+
+               /* tcp flags for tcp only */
+               if (proto == IPPROTO_TCP) {
+                       u_int flags;
+                       flags = EXTRACT_U_1(nr->tcp_flags);
+                       ND_PRINT("%s%s%s%s%s%s%s",
+                               flags & TH_FIN  ? "F" : "",
+                               flags & TH_SYN  ? "S" : "",
+                               flags & TH_RST  ? "R" : "",
+                               flags & TH_PUSH ? "P" : "",
+                               flags & TH_ACK  ? "A" : "",
+                               flags & TH_URG  ? "U" : "",
+                               flags           ? " " : "");
+               }

 
 

-       if (ver == 5) {
-               printf("#%u, ", htonl(nh->sequence));
-               nr = (struct nfrec *)&nh[1];
-               snaplen -= 24;
-       } else {
-               nr = (struct nfrec *)&nh->sequence;
-               snaplen -= 16;
+               buf[0]='\0';
+               ND_PRINT("tos %u, %u (%u octets) %s",
+                      EXTRACT_U_1(nr->tos),
+                      EXTRACT_BE_U_4(nr->packets),
+                      EXTRACT_BE_U_4(nr->octets), buf);

        }
        }

+       return;
+
+trunc:
+       nd_print_trunc(ndo);
+       return;
+}
+
+static void
+cnfp_v5_print(netdissect_options *ndo, const u_char *cp)
+{
+       const struct nfhdr_v5 *nh;
+       const struct nfrec_v5 *nr;
+       const char *p_name;
+       uint8_t proto;
+       u_int nrecs, ver;
+#if 0
+       time_t t;
+#endif
+
+       nh = (const struct nfhdr_v5 *)cp;
+       ND_TCHECK_SIZE(nh);
+
+       ver = EXTRACT_BE_U_2(nh->version);
+       nrecs = EXTRACT_BE_U_4(nh->count);
+#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_BE_U_4(nh->utc_sec);
+#endif
+
+       ND_PRINT("NetFlow v%x, %u.%03u uptime, %u.%09u, ", ver,
+              EXTRACT_BE_U_4(nh->msys_uptime)/1000,
+              EXTRACT_BE_U_4(nh->msys_uptime)%1000,
+              EXTRACT_BE_U_4(nh->utc_sec), EXTRACT_BE_U_4(nh->utc_nsec));

 
 

-       printf("%2u recs", nrecs);
+       ND_PRINT("#%u, ", EXTRACT_BE_U_4(nh->sequence));
+       nr = (const struct nfrec_v5 *)&nh[1];

 
 

-       for (; nrecs-- && (u_char *)(nr + 1) <= snapend; nr++) {
+       ND_PRINT("%2u recs", nrecs);
+
+       for (; nrecs != 0; nr++, nrecs--) {

                char buf[20];
                char asbuf[20];
 
                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);
+               /*
+                * Make sure we have the entire record.
+                */
+               ND_TCHECK_SIZE(nr);
+               ND_PRINT("\n  started %u.%03u, last %u.%03u",
+                      EXTRACT_BE_U_4(nr->start_time)/1000,
+                      EXTRACT_BE_U_4(nr->start_time)%1000,
+                      EXTRACT_BE_U_4(nr->last_time)/1000,
+                      EXTRACT_BE_U_4(nr->last_time)%1000);

 
                asbuf[0] = buf[0] = '\0';
 
                asbuf[0] = buf[0] = '\0';

-               if (ver == 5) {
-                       snprintf(buf, sizeof(buf), "/%u",
-                           (ntohl(nr->masks) >> 24) & 0xff);
-                       snprintf(asbuf, sizeof(asbuf), "%u:",
-                           (ntohl(nr->asses) >> 16) & 0xffff);
-               }
-               printf("\n    %s%s%s:%u ", inet_ntoa(nr->src_ina), buf, asbuf,
-                       ntohl(nr->ports) >> 16);
-
-               if (ver == 5) {
-                       snprintf(buf, sizeof(buf), "/%d",
-                           (ntohl(nr->masks) >> 16) & 0xff);
-                       snprintf(asbuf, sizeof(asbuf), "%u:",
-                           ntohl(nr->asses) & 0xffff);
+               nd_snprintf(buf, sizeof(buf), "/%u", EXTRACT_U_1(nr->src_mask));
+               nd_snprintf(asbuf, sizeof(asbuf), ":%u",
+                       EXTRACT_BE_U_2(nr->src_as));
+               ND_PRINT("\n    %s%s%s:%u ",
+                       intoa(EXTRACT_IPV4_TO_NETWORK_ORDER(nr->src_ina)),
+                       buf, asbuf,
+                       EXTRACT_BE_U_2(nr->srcport));
+
+               nd_snprintf(buf, sizeof(buf), "/%u", EXTRACT_U_1(nr->dst_mask));
+               nd_snprintf(asbuf, sizeof(asbuf), ":%u",
+                        EXTRACT_BE_U_2(nr->dst_as));
+               ND_PRINT("> %s%s%s:%u ",
+                       intoa(EXTRACT_IPV4_TO_NETWORK_ORDER(nr->dst_ina)),
+                       buf, asbuf,
+                       EXTRACT_BE_U_2(nr->dstport));
+
+               ND_PRINT(">> %s\n    ",
+                       intoa(EXTRACT_IPV4_TO_NETWORK_ORDER(nr->nhop_ina)));
+
+               proto = EXTRACT_U_1(nr->proto);
+               if (!ndo->ndo_nflag && (p_name = netdb_protoname(proto)) != NULL)
+                       ND_PRINT("%s ", p_name);
+               else
+                       ND_PRINT("%u ", proto);
+
+               /* tcp flags for tcp only */
+               if (proto == IPPROTO_TCP) {
+                       u_int flags;
+                       flags = EXTRACT_U_1(nr->tcp_flags);
+                       ND_PRINT("%s%s%s%s%s%s%s",
+                               flags & TH_FIN  ? "F" : "",
+                               flags & TH_SYN  ? "S" : "",
+                               flags & TH_RST  ? "R" : "",
+                               flags & TH_PUSH ? "P" : "",
+                               flags & TH_ACK  ? "A" : "",
+                               flags & TH_URG  ? "U" : "",
+                               flags           ? " " : "");

                }
                }

-               printf("> %s%s%s:%u ", inet_ntoa(nr->dst_ina), buf, asbuf,
-                       ntohl(nr->ports) & 0xffff);

 
 

-               printf(">> %s\n    ", inet_ntoa(nr->nhop_ina));
+               buf[0]='\0';
+               ND_PRINT("tos %u, %u (%u octets) %s",
+                      EXTRACT_U_1(nr->tos),
+                      EXTRACT_BE_U_4(nr->packets),
+                      EXTRACT_BE_U_4(nr->octets), buf);
+       }
+       return;
+
+trunc:
+       nd_print_trunc(ndo);
+       return;
+}
+
+static void
+cnfp_v6_print(netdissect_options *ndo, const u_char *cp)
+{
+       const struct nfhdr_v6 *nh;
+       const struct nfrec_v6 *nr;
+       const char *p_name;
+       uint8_t proto;
+       u_int nrecs, ver;
+#if 0
+       time_t t;
+#endif
+
+       nh = (const struct nfhdr_v6 *)cp;
+       ND_TCHECK_SIZE(nh);
+
+       ver = EXTRACT_BE_U_2(nh->version);
+       nrecs = EXTRACT_BE_U_4(nh->count);
+#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_BE_U_4(nh->utc_sec);
+#endif
+
+       ND_PRINT("NetFlow v%x, %u.%03u uptime, %u.%09u, ", ver,
+              EXTRACT_BE_U_4(nh->msys_uptime)/1000,
+              EXTRACT_BE_U_4(nh->msys_uptime)%1000,
+              EXTRACT_BE_U_4(nh->utc_sec), EXTRACT_BE_U_4(nh->utc_nsec));
+
+       ND_PRINT("#%u, ", EXTRACT_BE_U_4(nh->sequence));
+       nr = (const struct nfrec_v6 *)&nh[1];
+
+       ND_PRINT("%2u recs", nrecs);

 
 

-               pent = getprotobynumber((ntohl(nr->proto_tos) >> 8) & 0xff);
-               if (!pent || nflag)
-                       printf("%u ", (ntohl(nr->proto_tos) >> 8) & 0xff);
+       for (; nrecs != 0; nr++, nrecs--) {
+               char buf[20];
+               char asbuf[20];
+
+               /*
+                * Make sure we have the entire record.
+                */
+               ND_TCHECK_SIZE(nr);
+               ND_PRINT("\n  started %u.%03u, last %u.%03u",
+                      EXTRACT_BE_U_4(nr->start_time)/1000,
+                      EXTRACT_BE_U_4(nr->start_time)%1000,
+                      EXTRACT_BE_U_4(nr->last_time)/1000,
+                      EXTRACT_BE_U_4(nr->last_time)%1000);
+
+               asbuf[0] = buf[0] = '\0';
+               nd_snprintf(buf, sizeof(buf), "/%u", EXTRACT_U_1(nr->src_mask));
+               nd_snprintf(asbuf, sizeof(asbuf), ":%u",
+                       EXTRACT_BE_U_2(nr->src_as));
+               ND_PRINT("\n    %s%s%s:%u ",
+                       intoa(EXTRACT_IPV4_TO_NETWORK_ORDER(nr->src_ina)),
+                       buf, asbuf,
+                       EXTRACT_BE_U_2(nr->srcport));
+
+               nd_snprintf(buf, sizeof(buf), "/%u", EXTRACT_U_1(nr->dst_mask));
+               nd_snprintf(asbuf, sizeof(asbuf), ":%u",
+                        EXTRACT_BE_U_2(nr->dst_as));
+               ND_PRINT("> %s%s%s:%u ",
+                       intoa(EXTRACT_IPV4_TO_NETWORK_ORDER(nr->dst_ina)),
+                       buf, asbuf,
+                       EXTRACT_BE_U_2(nr->dstport));
+
+               ND_PRINT(">> %s\n    ",
+                       intoa(EXTRACT_IPV4_TO_NETWORK_ORDER(nr->nhop_ina)));
+
+               proto = EXTRACT_U_1(nr->proto);
+               if (!ndo->ndo_nflag && (p_name = netdb_protoname(proto)) != NULL)
+                       ND_PRINT("%s ", p_name);

                else
                else

-                       printf("%s ", pent->p_name);
+                       ND_PRINT("%u ", proto);

 
                /* tcp flags for tcp only */
 
                /* tcp flags for tcp only */

-               if (pent && pent->p_proto == IPPROTO_TCP) {
-                       int flags;
-                       if (ver == 1)
-                               flags = (ntohl(nr->asses) >> 24) & 0xff;
-                       else
-                               flags = (ntohl(nr->proto_tos) >> 16) & 0xff;
-                       if (flags & TH_FIN)     putchar('F');
-                       if (flags & TH_SYN)     putchar('S');
-                       if (flags & TH_RST)     putchar('R');
-                       if (flags & TH_PUSH)    putchar('P');
-                       if (flags & TH_ACK)     putchar('A');
-                       if (flags & TH_URG)     putchar('U');
-                       if (flags)
-                               putchar(' ');
+               if (proto == IPPROTO_TCP) {
+                       u_int flags;
+                       flags = EXTRACT_U_1(nr->tcp_flags);
+                       ND_PRINT("%s%s%s%s%s%s%s",
+                               flags & TH_FIN  ? "F" : "",
+                               flags & TH_SYN  ? "S" : "",
+                               flags & TH_RST  ? "R" : "",
+                               flags & TH_PUSH ? "P" : "",
+                               flags & TH_ACK  ? "A" : "",
+                               flags & TH_URG  ? "U" : "",
+                               flags           ? " " : "");

                }
                }

-               printf("tos %u, %u (%u octets)", ntohl(nr->proto_tos) & 0xff,
-                       ntohl(nr->packets), ntohl(nr->octets));
+
+               buf[0]='\0';
+               nd_snprintf(buf, sizeof(buf), "(%u<>%u encaps)",
+                        (EXTRACT_BE_U_2(nr->flags) >> 8) & 0xff,
+                        (EXTRACT_BE_U_2(nr->flags)) & 0xff);
+               ND_PRINT("tos %u, %u (%u octets) %s",
+                      EXTRACT_U_1(nr->tos),
+                      EXTRACT_BE_U_4(nr->packets),
+                      EXTRACT_BE_U_4(nr->octets), buf);

        }
        }

+       return;
+
+trunc:
+       nd_print_trunc(ndo);
+       return;
+}
+
+void
+cnfp_print(netdissect_options *ndo, const u_char *cp)
+{
+       int ver;
+
+       /*
+        * First 2 bytes are the version number.
+        */
+       ndo->ndo_protocol = "cnfp";
+       ND_TCHECK_2(cp);
+       ver = EXTRACT_BE_U_2(cp);
+       switch (ver) {
+
+       case 1:
+               cnfp_v1_print(ndo, cp);
+               break;
+
+       case 5:
+               cnfp_v5_print(ndo, cp);
+               break;
+
+       case 6:
+               cnfp_v6_print(ndo, cp);
+               break;
+
+       default:
+               ND_PRINT("NetFlow v%x", ver);
+               break;
+       }
+       return;
+
+trunc:
+       nd_print_trunc(ndo);
+       return;

 }
 }