]> The Tcpdump Group git mirrors - tcpdump/blobdiff - print-cnfp.c
projects / tcpdump / blobdiff
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Revert partially the commit 21b1273
[tcpdump] / print-cnfp.c
diff --git a/print-cnfp.c b/print-cnfp.c
index 84de1294017ccc4e088f150b9c7e01cd73d0d7f7..69f905f5c94ea7c6ce3b42112fa206749e2cb99c 100644 (file)
--- a/print-cnfp.c
+++ b/print-cnfp.c
@@ -37,14 +37,14 @@
  *
  * See
  *
  *
  * See
  *
- *    http://www.cisco.com/c/en/us/td/docs/net_mgmt/netflow_collection_engine/3-6/user/guide/format.html#wp1005892
+ *    https://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 <netdissect-stdinc.h>
+#include "netdissect-stdinc.h"
 
 #include <stdio.h>
 #include <string.h>
 
 #include <stdio.h>
 #include <string.h>
@@ -65,9 +65,9 @@ struct nfhdr_v1 {
 };
 
 struct nfrec_v1 {
 };
 
 struct nfrec_v1 {
-       struct in_addr  src_ina;
-       struct in_addr  dst_ina;
-       struct in_addr  nhop_ina;
+       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_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 */
@@ -97,9 +97,9 @@ struct nfhdr_v5 {
 };
 
 struct nfrec_v5 {
 };
 
 struct nfrec_v5 {
-       struct in_addr  src_ina;
-       struct in_addr  dst_ina;
-       struct in_addr  nhop_ina;
+       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_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 */
@@ -117,7 +117,7 @@ struct nfrec_v5 {
        nd_uint8_t      src_mask;       /* source address mask bits */
        nd_uint8_t      dst_mask;       /* destination address prefix mask bits */
        nd_byte         pad2[2];
        nd_uint8_t      src_mask;       /* source address mask bits */
        nd_uint8_t      dst_mask;       /* destination address prefix mask bits */
        nd_byte         pad2[2];
-       struct in_addr  peer_nexthop;   /* v6: IP address of the nexthop within the peer (FIB)*/
+       nd_ipv4         peer_nexthop;   /* v6: IP address of the nexthop within the peer (FIB)*/
 };
 
 struct nfhdr_v6 {
 };
 
 struct nfhdr_v6 {
@@ -131,9 +131,9 @@ struct nfhdr_v6 {
 };
 
 struct nfrec_v6 {
 };
 
 struct nfrec_v6 {
-       struct in_addr  src_ina;
-       struct in_addr  dst_ina;
-       struct in_addr  nhop_ina;
+       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_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 */
@@ -151,7 +151,7 @@ struct nfrec_v6 {
        nd_uint8_t      src_mask;       /* source address mask bits */
        nd_uint8_t      dst_mask;       /* destination address prefix mask bits */
        nd_uint16_t     flags;
        nd_uint8_t      src_mask;       /* source address mask bits */
        nd_uint8_t      dst_mask;       /* destination address prefix mask bits */
        nd_uint16_t     flags;
-       struct in_addr  peer_nexthop;   /* v6: IP address of the nexthop within the peer (FIB)*/
+       nd_ipv4         peer_nexthop;   /* v6: IP address of the nexthop within the peer (FIB)*/
 };
 
 static void
 };
 
 static void
@@ -169,21 +169,21 @@ cnfp_v1_print(netdissect_options *ndo, const u_char *cp)
        nh = (const struct nfhdr_v1 *)cp;
        ND_TCHECK_SIZE(nh);
 
        nh = (const struct nfhdr_v1 *)cp;
        ND_TCHECK_SIZE(nh);
 
-       ver = EXTRACT_BE_U_2(nh->version);
-       nrecs = EXTRACT_BE_U_4(nh->count);
+       ver = GET_BE_U_2(nh->version);
+       nrecs = GET_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.
         */
 #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);
+       t = GET_BE_U_4(nh->utc_sec);
 #endif
 
        ND_PRINT("NetFlow v%x, %u.%03u uptime, %u.%09u, ", ver,
 #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));
+              GET_BE_U_4(nh->msys_uptime)/1000,
+              GET_BE_U_4(nh->msys_uptime)%1000,
+              GET_BE_U_4(nh->utc_sec), GET_BE_U_4(nh->utc_nsec));
 
        nr = (const struct nfrec_v1 *)&nh[1];
 
 
        nr = (const struct nfrec_v1 *)&nh[1];
 
@@ -198,21 +198,26 @@ cnfp_v1_print(netdissect_options *ndo, const u_char *cp)
                 */
                ND_TCHECK_SIZE(nr);
                ND_PRINT("\n  started %u.%03u, last %u.%03u",
                 */
                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);
+                      GET_BE_U_4(nr->start_time)/1000,
+                      GET_BE_U_4(nr->start_time)%1000,
+                      GET_BE_U_4(nr->last_time)/1000,
+                      GET_BE_U_4(nr->last_time)%1000);
 
                asbuf[0] = buf[0] = '\0';
 
                asbuf[0] = buf[0] = '\0';
-               ND_PRINT("\n    %s%s%s:%u ", intoa(nr->src_ina.s_addr), buf, asbuf,
-                       EXTRACT_BE_U_2(nr->srcport));
+               ND_PRINT("\n    %s%s%s:%u ",
+                       intoa(GET_IPV4_TO_NETWORK_ORDER(nr->src_ina)),
+                       buf, asbuf,
+                       GET_BE_U_2(nr->srcport));
 
 
-               ND_PRINT("> %s%s%s:%u ", intoa(nr->dst_ina.s_addr), buf, asbuf,
-                       EXTRACT_BE_U_2(nr->dstport));
+               ND_PRINT("> %s%s%s:%u ",
+                       intoa(GET_IPV4_TO_NETWORK_ORDER(nr->dst_ina)),
+                       buf, asbuf,
+                       GET_BE_U_2(nr->dstport));
 
 
-               ND_PRINT(">> %s\n    ", intoa(nr->nhop_ina.s_addr));
+               ND_PRINT(">> %s\n    ",
+                       intoa(GET_IPV4_TO_NETWORK_ORDER(nr->nhop_ina)));
 
 
-               proto = EXTRACT_U_1(nr->proto);
+               proto = GET_U_1(nr->proto);
                if (!ndo->ndo_nflag && (p_name = netdb_protoname(proto)) != NULL)
                        ND_PRINT("%s ", p_name);
                else
                if (!ndo->ndo_nflag && (p_name = netdb_protoname(proto)) != NULL)
                        ND_PRINT("%s ", p_name);
                else
@@ -221,7 +226,7 @@ cnfp_v1_print(netdissect_options *ndo, const u_char *cp)
                /* tcp flags for tcp only */
                if (proto == IPPROTO_TCP) {
                        u_int flags;
                /* tcp flags for tcp only */
                if (proto == IPPROTO_TCP) {
                        u_int flags;
-                       flags = EXTRACT_U_1(nr->tcp_flags);
+                       flags = GET_U_1(nr->tcp_flags);
                        ND_PRINT("%s%s%s%s%s%s%s",
                                flags & TH_FIN  ? "F" : "",
                                flags & TH_SYN  ? "S" : "",
                        ND_PRINT("%s%s%s%s%s%s%s",
                                flags & TH_FIN  ? "F" : "",
                                flags & TH_SYN  ? "S" : "",
@@ -234,14 +239,14 @@ cnfp_v1_print(netdissect_options *ndo, const u_char *cp)
 
                buf[0]='\0';
                ND_PRINT("tos %u, %u (%u octets) %s",
 
                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);
+                      GET_U_1(nr->tos),
+                      GET_BE_U_4(nr->packets),
+                      GET_BE_U_4(nr->octets), buf);
        }
        return;
 
 trunc:
        }
        return;
 
 trunc:
-       ND_PRINT("[|cnfp]");
+       nd_print_trunc(ndo);
        return;
 }
 
        return;
 }
 
@@ -260,23 +265,23 @@ cnfp_v5_print(netdissect_options *ndo, const u_char *cp)
        nh = (const struct nfhdr_v5 *)cp;
        ND_TCHECK_SIZE(nh);
 
        nh = (const struct nfhdr_v5 *)cp;
        ND_TCHECK_SIZE(nh);
 
-       ver = EXTRACT_BE_U_2(nh->version);
-       nrecs = EXTRACT_BE_U_4(nh->count);
+       ver = GET_BE_U_2(nh->version);
+       nrecs = GET_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.
         */
 #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);
+       t = GET_BE_U_4(nh->utc_sec);
 #endif
 
        ND_PRINT("NetFlow v%x, %u.%03u uptime, %u.%09u, ", ver,
 #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));
+              GET_BE_U_4(nh->msys_uptime)/1000,
+              GET_BE_U_4(nh->msys_uptime)%1000,
+              GET_BE_U_4(nh->utc_sec), GET_BE_U_4(nh->utc_nsec));
 
 
-       ND_PRINT("#%u, ", EXTRACT_BE_U_4(nh->sequence));
+       ND_PRINT("#%u, ", GET_BE_U_4(nh->sequence));
        nr = (const struct nfrec_v5 *)&nh[1];
 
        ND_PRINT("%2u recs", nrecs);
        nr = (const struct nfrec_v5 *)&nh[1];
 
        ND_PRINT("%2u recs", nrecs);
@@ -290,27 +295,32 @@ cnfp_v5_print(netdissect_options *ndo, const u_char *cp)
                 */
                ND_TCHECK_SIZE(nr);
                ND_PRINT("\n  started %u.%03u, last %u.%03u",
                 */
                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);
+                      GET_BE_U_4(nr->start_time)/1000,
+                      GET_BE_U_4(nr->start_time)%1000,
+                      GET_BE_U_4(nr->last_time)/1000,
+                      GET_BE_U_4(nr->last_time)%1000);
 
                asbuf[0] = buf[0] = '\0';
 
                asbuf[0] = buf[0] = '\0';
-               snprintf(buf, sizeof(buf), "/%u", EXTRACT_U_1(nr->src_mask));
+               snprintf(buf, sizeof(buf), "/%u", GET_U_1(nr->src_mask));
                snprintf(asbuf, sizeof(asbuf), ":%u",
                snprintf(asbuf, sizeof(asbuf), ":%u",
-                       EXTRACT_BE_U_2(nr->src_as));
-               ND_PRINT("\n    %s%s%s:%u ", intoa(nr->src_ina.s_addr), buf, asbuf,
-                       EXTRACT_BE_U_2(nr->srcport));
+                       GET_BE_U_2(nr->src_as));
+               ND_PRINT("\n    %s%s%s:%u ",
+                       intoa(GET_IPV4_TO_NETWORK_ORDER(nr->src_ina)),
+                       buf, asbuf,
+                       GET_BE_U_2(nr->srcport));
 
 
-               snprintf(buf, sizeof(buf), "/%u", EXTRACT_U_1(nr->dst_mask));
+               snprintf(buf, sizeof(buf), "/%u", GET_U_1(nr->dst_mask));
                snprintf(asbuf, sizeof(asbuf), ":%u",
                snprintf(asbuf, sizeof(asbuf), ":%u",
-                        EXTRACT_BE_U_2(nr->dst_as));
-               ND_PRINT("> %s%s%s:%u ", intoa(nr->dst_ina.s_addr), buf, asbuf,
-                       EXTRACT_BE_U_2(nr->dstport));
+                        GET_BE_U_2(nr->dst_as));
+               ND_PRINT("> %s%s%s:%u ",
+                       intoa(GET_IPV4_TO_NETWORK_ORDER(nr->dst_ina)),
+                       buf, asbuf,
+                       GET_BE_U_2(nr->dstport));
 
 
-               ND_PRINT(">> %s\n    ", intoa(nr->nhop_ina.s_addr));
+               ND_PRINT(">> %s\n    ",
+                       intoa(GET_IPV4_TO_NETWORK_ORDER(nr->nhop_ina)));
 
 
-               proto = EXTRACT_U_1(nr->proto);
+               proto = GET_U_1(nr->proto);
                if (!ndo->ndo_nflag && (p_name = netdb_protoname(proto)) != NULL)
                        ND_PRINT("%s ", p_name);
                else
                if (!ndo->ndo_nflag && (p_name = netdb_protoname(proto)) != NULL)
                        ND_PRINT("%s ", p_name);
                else
@@ -319,7 +329,7 @@ cnfp_v5_print(netdissect_options *ndo, const u_char *cp)
                /* tcp flags for tcp only */
                if (proto == IPPROTO_TCP) {
                        u_int flags;
                /* tcp flags for tcp only */
                if (proto == IPPROTO_TCP) {
                        u_int flags;
-                       flags = EXTRACT_U_1(nr->tcp_flags);
+                       flags = GET_U_1(nr->tcp_flags);
                        ND_PRINT("%s%s%s%s%s%s%s",
                                flags & TH_FIN  ? "F" : "",
                                flags & TH_SYN  ? "S" : "",
                        ND_PRINT("%s%s%s%s%s%s%s",
                                flags & TH_FIN  ? "F" : "",
                                flags & TH_SYN  ? "S" : "",
@@ -332,14 +342,14 @@ cnfp_v5_print(netdissect_options *ndo, const u_char *cp)
 
                buf[0]='\0';
                ND_PRINT("tos %u, %u (%u octets) %s",
 
                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);
+                      GET_U_1(nr->tos),
+                      GET_BE_U_4(nr->packets),
+                      GET_BE_U_4(nr->octets), buf);
        }
        return;
 
 trunc:
        }
        return;
 
 trunc:
-       ND_PRINT("[|cnfp]");
+       nd_print_trunc(ndo);
        return;
 }
 
        return;
 }
 
@@ -358,23 +368,23 @@ cnfp_v6_print(netdissect_options *ndo, const u_char *cp)
        nh = (const struct nfhdr_v6 *)cp;
        ND_TCHECK_SIZE(nh);
 
        nh = (const struct nfhdr_v6 *)cp;
        ND_TCHECK_SIZE(nh);
 
-       ver = EXTRACT_BE_U_2(nh->version);
-       nrecs = EXTRACT_BE_U_4(nh->count);
+       ver = GET_BE_U_2(nh->version);
+       nrecs = GET_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.
         */
 #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);
+       t = GET_BE_U_4(nh->utc_sec);
 #endif
 
        ND_PRINT("NetFlow v%x, %u.%03u uptime, %u.%09u, ", ver,
 #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));
+              GET_BE_U_4(nh->msys_uptime)/1000,
+              GET_BE_U_4(nh->msys_uptime)%1000,
+              GET_BE_U_4(nh->utc_sec), GET_BE_U_4(nh->utc_nsec));
 
 
-       ND_PRINT("#%u, ", EXTRACT_BE_U_4(nh->sequence));
+       ND_PRINT("#%u, ", GET_BE_U_4(nh->sequence));
        nr = (const struct nfrec_v6 *)&nh[1];
 
        ND_PRINT("%2u recs", nrecs);
        nr = (const struct nfrec_v6 *)&nh[1];
 
        ND_PRINT("%2u recs", nrecs);
@@ -388,27 +398,32 @@ cnfp_v6_print(netdissect_options *ndo, const u_char *cp)
                 */
                ND_TCHECK_SIZE(nr);
                ND_PRINT("\n  started %u.%03u, last %u.%03u",
                 */
                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);
+                      GET_BE_U_4(nr->start_time)/1000,
+                      GET_BE_U_4(nr->start_time)%1000,
+                      GET_BE_U_4(nr->last_time)/1000,
+                      GET_BE_U_4(nr->last_time)%1000);
 
                asbuf[0] = buf[0] = '\0';
 
                asbuf[0] = buf[0] = '\0';
-               snprintf(buf, sizeof(buf), "/%u", EXTRACT_U_1(nr->src_mask));
+               snprintf(buf, sizeof(buf), "/%u", GET_U_1(nr->src_mask));
                snprintf(asbuf, sizeof(asbuf), ":%u",
                snprintf(asbuf, sizeof(asbuf), ":%u",
-                       EXTRACT_BE_U_2(nr->src_as));
-               ND_PRINT("\n    %s%s%s:%u ", intoa(nr->src_ina.s_addr), buf, asbuf,
-                       EXTRACT_BE_U_2(nr->srcport));
+                       GET_BE_U_2(nr->src_as));
+               ND_PRINT("\n    %s%s%s:%u ",
+                       intoa(GET_IPV4_TO_NETWORK_ORDER(nr->src_ina)),
+                       buf, asbuf,
+                       GET_BE_U_2(nr->srcport));
 
 
-               snprintf(buf, sizeof(buf), "/%u", EXTRACT_U_1(nr->dst_mask));
+               snprintf(buf, sizeof(buf), "/%u", GET_U_1(nr->dst_mask));
                snprintf(asbuf, sizeof(asbuf), ":%u",
                snprintf(asbuf, sizeof(asbuf), ":%u",
-                        EXTRACT_BE_U_2(nr->dst_as));
-               ND_PRINT("> %s%s%s:%u ", intoa(nr->dst_ina.s_addr), buf, asbuf,
-                       EXTRACT_BE_U_2(nr->dstport));
+                        GET_BE_U_2(nr->dst_as));
+               ND_PRINT("> %s%s%s:%u ",
+                       intoa(GET_IPV4_TO_NETWORK_ORDER(nr->dst_ina)),
+                       buf, asbuf,
+                       GET_BE_U_2(nr->dstport));
 
 
-               ND_PRINT(">> %s\n    ", intoa(nr->nhop_ina.s_addr));
+               ND_PRINT(">> %s\n    ",
+                       intoa(GET_IPV4_TO_NETWORK_ORDER(nr->nhop_ina)));
 
 
-               proto = EXTRACT_U_1(nr->proto);
+               proto = GET_U_1(nr->proto);
                if (!ndo->ndo_nflag && (p_name = netdb_protoname(proto)) != NULL)
                        ND_PRINT("%s ", p_name);
                else
                if (!ndo->ndo_nflag && (p_name = netdb_protoname(proto)) != NULL)
                        ND_PRINT("%s ", p_name);
                else
@@ -417,7 +432,7 @@ cnfp_v6_print(netdissect_options *ndo, const u_char *cp)
                /* tcp flags for tcp only */
                if (proto == IPPROTO_TCP) {
                        u_int flags;
                /* tcp flags for tcp only */
                if (proto == IPPROTO_TCP) {
                        u_int flags;
-                       flags = EXTRACT_U_1(nr->tcp_flags);
+                       flags = GET_U_1(nr->tcp_flags);
                        ND_PRINT("%s%s%s%s%s%s%s",
                                flags & TH_FIN  ? "F" : "",
                                flags & TH_SYN  ? "S" : "",
                        ND_PRINT("%s%s%s%s%s%s%s",
                                flags & TH_FIN  ? "F" : "",
                                flags & TH_SYN  ? "S" : "",
@@ -430,17 +445,17 @@ cnfp_v6_print(netdissect_options *ndo, const u_char *cp)
 
                buf[0]='\0';
                snprintf(buf, sizeof(buf), "(%u<>%u encaps)",
 
                buf[0]='\0';
                snprintf(buf, sizeof(buf), "(%u<>%u encaps)",
-                        (EXTRACT_BE_U_2(nr->flags) >> 8) & 0xff,
-                        (EXTRACT_BE_U_2(nr->flags)) & 0xff);
+                        (GET_BE_U_2(nr->flags) >> 8) & 0xff,
+                        (GET_BE_U_2(nr->flags)) & 0xff);
                ND_PRINT("tos %u, %u (%u octets) %s",
                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);
+                      GET_U_1(nr->tos),
+                      GET_BE_U_4(nr->packets),
+                      GET_BE_U_4(nr->octets), buf);
        }
        return;
 
 trunc:
        }
        return;
 
 trunc:
-       ND_PRINT("[|cnfp]");
+       nd_print_trunc(ndo);
        return;
 }
 
        return;
 }
 
@@ -452,8 +467,8 @@ cnfp_print(netdissect_options *ndo, const u_char *cp)
        /*
         * First 2 bytes are the version number.
         */
        /*
         * First 2 bytes are the version number.
         */
-       ND_TCHECK_2(cp);
-       ver = EXTRACT_BE_U_2(cp);
+       ndo->ndo_protocol = "cnfp";
+       ver = GET_BE_U_2(cp);
        switch (ver) {
 
        case 1:
        switch (ver) {
 
        case 1:
@@ -472,9 +487,4 @@ cnfp_print(netdissect_options *ndo, const u_char *cp)
                ND_PRINT("NetFlow v%x", ver);
                break;
        }
                ND_PRINT("NetFlow v%x", ver);
                break;
        }
-       return;
-
-trunc:
-       ND_PRINT("[|cnfp]");
-       return;
 }
 }
[mirror] the TCPdump network dissector