X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/dff09a17fb39a6e5739f87c7137b4bf91e8c801a..5ef0bcb5edd748de9d9af13c40da0395dfdd94e8:/print-cnfp.c

diff --git a/print-cnfp.c b/print-cnfp.c
index 08eb73a1..69f905f5 100644
--- a/print-cnfp.c
+++ b/print-cnfp.c
@@ -37,14 +37,14 @@
  *
  * 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
-#include "config.h"
+#include <config.h>
 #endif
 
-#include <netdissect-stdinc.h>
+#include "netdissect-stdinc.h"
 
 #include <stdio.h>
 #include <string.h>
@@ -65,9 +65,9 @@ struct nfhdr_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 */
@@ -97,9 +97,9 @@ struct nfhdr_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 */
@@ -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];
-	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 {
@@ -131,9 +131,9 @@ struct nfhdr_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 */
@@ -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;
-	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
@@ -167,27 +167,27 @@ cnfp_v1_print(netdissect_options *ndo, const u_char *cp)
 #endif
 
 	nh = (const struct nfhdr_v1 *)cp;
-	ND_TCHECK(*nh);
+	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.
 	 */
-	t = EXTRACT_BE_U_4(nh->utc_sec);
+	t = GET_BE_U_4(nh->utc_sec);
 #endif
 
-	ND_PRINT((ndo, "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("NetFlow v%x, %u.%03u uptime, %u.%09u, ", ver,
+	       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];
 
-	ND_PRINT((ndo, "%2u recs", nrecs));
+	ND_PRINT("%2u recs", nrecs);
 
 	for (; nrecs != 0; nr++, nrecs--) {
 		char buf[20];
@@ -196,52 +196,57 @@ cnfp_v1_print(netdissect_options *ndo, const u_char *cp)
 		/*
 		 * Make sure we have the entire record.
 		 */
-		ND_TCHECK(*nr);
-		ND_PRINT((ndo, "\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));
+		ND_TCHECK_SIZE(nr);
+		ND_PRINT("\n  started %u.%03u, last %u.%03u",
+		       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';
-		ND_PRINT((ndo, "\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((ndo, "> %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((ndo, ">> %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((ndo, "%s ", p_name));
+			ND_PRINT("%s ", p_name);
 		else
-			ND_PRINT((ndo, "%u ", proto));
+			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((ndo, "%s%s%s%s%s%s%s",
+			flags = GET_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           ? " " : ""));
+				flags           ? " " : "");
 		}
 
 		buf[0]='\0';
-		ND_PRINT((ndo, "tos %u, %u (%u octets) %s",
-		       EXTRACT_U_1(nr->tos),
-		       EXTRACT_BE_U_4(nr->packets),
-		       EXTRACT_BE_U_4(nr->octets), buf));
+		ND_PRINT("tos %u, %u (%u octets) %s",
+		       GET_U_1(nr->tos),
+		       GET_BE_U_4(nr->packets),
+		       GET_BE_U_4(nr->octets), buf);
 	}
 	return;
 
 trunc:
-	ND_PRINT((ndo, "[|cnfp]"));
+	nd_print_trunc(ndo);
 	return;
 }
 
@@ -258,28 +263,28 @@ cnfp_v5_print(netdissect_options *ndo, const u_char *cp)
 #endif
 
 	nh = (const struct nfhdr_v5 *)cp;
-	ND_TCHECK(*nh);
+	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.
 	 */
-	t = EXTRACT_BE_U_4(nh->utc_sec);
+	t = GET_BE_U_4(nh->utc_sec);
 #endif
 
-	ND_PRINT((ndo, "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("NetFlow v%x, %u.%03u uptime, %u.%09u, ", ver,
+	       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((ndo, "#%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((ndo, "%2u recs", nrecs));
+	ND_PRINT("%2u recs", nrecs);
 
 	for (; nrecs != 0; nr++, nrecs--) {
 		char buf[20];
@@ -288,58 +293,63 @@ cnfp_v5_print(netdissect_options *ndo, const u_char *cp)
 		/*
 		 * Make sure we have the entire record.
 		 */
-		ND_TCHECK(*nr);
-		ND_PRINT((ndo, "\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));
+		ND_TCHECK_SIZE(nr);
+		ND_PRINT("\n  started %u.%03u, last %u.%03u",
+		       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';
-		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",
-			EXTRACT_BE_U_2(nr->src_as));
-		ND_PRINT((ndo, "\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",
-			 EXTRACT_BE_U_2(nr->dst_as));
-		ND_PRINT((ndo, "> %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((ndo, ">> %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((ndo, "%s ", p_name));
+			ND_PRINT("%s ", p_name);
 		else
-			ND_PRINT((ndo, "%u ", proto));
+			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((ndo, "%s%s%s%s%s%s%s",
+			flags = GET_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           ? " " : ""));
+				flags           ? " " : "");
 		}
 
 		buf[0]='\0';
-		ND_PRINT((ndo, "tos %u, %u (%u octets) %s",
-		       EXTRACT_U_1(nr->tos),
-		       EXTRACT_BE_U_4(nr->packets),
-		       EXTRACT_BE_U_4(nr->octets), buf));
+		ND_PRINT("tos %u, %u (%u octets) %s",
+		       GET_U_1(nr->tos),
+		       GET_BE_U_4(nr->packets),
+		       GET_BE_U_4(nr->octets), buf);
 	}
 	return;
 
 trunc:
-	ND_PRINT((ndo, "[|cnfp]"));
+	nd_print_trunc(ndo);
 	return;
 }
 
@@ -356,28 +366,28 @@ cnfp_v6_print(netdissect_options *ndo, const u_char *cp)
 #endif
 
 	nh = (const struct nfhdr_v6 *)cp;
-	ND_TCHECK(*nh);
+	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.
 	 */
-	t = EXTRACT_BE_U_4(nh->utc_sec);
+	t = GET_BE_U_4(nh->utc_sec);
 #endif
 
-	ND_PRINT((ndo, "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("NetFlow v%x, %u.%03u uptime, %u.%09u, ", ver,
+	       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((ndo, "#%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((ndo, "%2u recs", nrecs));
+	ND_PRINT("%2u recs", nrecs);
 
 	for (; nrecs != 0; nr++, nrecs--) {
 		char buf[20];
@@ -386,61 +396,66 @@ cnfp_v6_print(netdissect_options *ndo, const u_char *cp)
 		/*
 		 * Make sure we have the entire record.
 		 */
-		ND_TCHECK(*nr);
-		ND_PRINT((ndo, "\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));
+		ND_TCHECK_SIZE(nr);
+		ND_PRINT("\n  started %u.%03u, last %u.%03u",
+		       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';
-		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",
-			EXTRACT_BE_U_2(nr->src_as));
-		ND_PRINT((ndo, "\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",
-			 EXTRACT_BE_U_2(nr->dst_as));
-		ND_PRINT((ndo, "> %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((ndo, ">> %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((ndo, "%s ", p_name));
+			ND_PRINT("%s ", p_name);
 		else
-			ND_PRINT((ndo, "%u ", proto));
+			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((ndo, "%s%s%s%s%s%s%s",
+			flags = GET_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           ? " " : ""));
+				flags           ? " " : "");
 		}
 
 		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);
-		ND_PRINT((ndo, "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_BE_U_2(nr->flags) >> 8) & 0xff,
+			 (GET_BE_U_2(nr->flags)) & 0xff);
+		ND_PRINT("tos %u, %u (%u octets) %s",
+		       GET_U_1(nr->tos),
+		       GET_BE_U_4(nr->packets),
+		       GET_BE_U_4(nr->octets), buf);
 	}
 	return;
 
 trunc:
-	ND_PRINT((ndo, "[|cnfp]"));
+	nd_print_trunc(ndo);
 	return;
 }
 
@@ -452,8 +467,8 @@ cnfp_print(netdissect_options *ndo, const u_char *cp)
 	/*
 	 * 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:
@@ -469,12 +484,7 @@ cnfp_print(netdissect_options *ndo, const u_char *cp)
 		break;
 
 	default:
-		ND_PRINT((ndo, "NetFlow v%x", ver));
+		ND_PRINT("NetFlow v%x", ver);
 		break;
 	}
-	return;
-
-trunc:
-	ND_PRINT((ndo, "[|cnfp]"));
-	return;
 }