X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/d526e47658b691c4b5ca0d29759d1f67b7fb037b..8030a66cdcbf81c88cbb7c38ef7a334e9f1941cd:/print-cnfp.c diff --git a/print-cnfp.c b/print-cnfp.c index f0d381ac..b06e27f0 100644 --- a/print-cnfp.c +++ b/print-cnfp.c @@ -41,10 +41,10 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif -#include +#include "netdissect-stdinc.h" #include #include @@ -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 @@ -180,14 +180,14 @@ cnfp_v1_print(netdissect_options *ndo, const u_char *cp) t = EXTRACT_BE_U_4(nh->utc_sec); #endif - ND_PRINT((ndo, "NetFlow v%x, %u.%03u uptime, %u.%09u, ", ver, + 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))); + EXTRACT_BE_U_4(nh->utc_sec), EXTRACT_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]; @@ -197,51 +197,56 @@ cnfp_v1_print(netdissect_options *ndo, const u_char *cp) * Make sure we have the entire record. */ ND_TCHECK_SIZE(nr); - ND_PRINT((ndo, "\n started %u.%03u, last %u.%03u", + 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)); + EXTRACT_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(EXTRACT_IPV4_TO_NETWORK_ORDER(nr->src_ina)), + buf, asbuf, + EXTRACT_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(EXTRACT_IPV4_TO_NETWORK_ORDER(nr->dst_ina)), + buf, asbuf, + EXTRACT_BE_U_2(nr->dstport)); - ND_PRINT((ndo, ">> %s\n ", intoa(nr->nhop_ina.s_addr))); + 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((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", + 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", + 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)); + EXTRACT_BE_U_4(nr->octets), buf); } return; trunc: - ND_PRINT((ndo, "[|cnfp]")); + nd_print_trunc(ndo); return; } @@ -271,15 +276,15 @@ cnfp_v5_print(netdissect_options *ndo, const u_char *cp) t = EXTRACT_BE_U_4(nh->utc_sec); #endif - ND_PRINT((ndo, "NetFlow v%x, %u.%03u uptime, %u.%09u, ", ver, + 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))); + EXTRACT_BE_U_4(nh->utc_sec), EXTRACT_BE_U_4(nh->utc_nsec)); - ND_PRINT((ndo, "#%u, ", EXTRACT_BE_U_4(nh->sequence))); + ND_PRINT("#%u, ", EXTRACT_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]; @@ -289,57 +294,62 @@ cnfp_v5_print(netdissect_options *ndo, const u_char *cp) * Make sure we have the entire record. */ ND_TCHECK_SIZE(nr); - ND_PRINT((ndo, "\n started %u.%03u, last %u.%03u", + 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)); + EXTRACT_BE_U_4(nr->last_time)%1000); asbuf[0] = buf[0] = '\0'; - snprintf(buf, sizeof(buf), "/%u", EXTRACT_U_1(nr->src_mask)); - snprintf(asbuf, sizeof(asbuf), ":%u", + 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((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(EXTRACT_IPV4_TO_NETWORK_ORDER(nr->src_ina)), + buf, asbuf, + EXTRACT_BE_U_2(nr->srcport)); - snprintf(buf, sizeof(buf), "/%u", EXTRACT_U_1(nr->dst_mask)); - snprintf(asbuf, sizeof(asbuf), ":%u", + 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((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(EXTRACT_IPV4_TO_NETWORK_ORDER(nr->dst_ina)), + buf, asbuf, + EXTRACT_BE_U_2(nr->dstport)); - ND_PRINT((ndo, ">> %s\n ", intoa(nr->nhop_ina.s_addr))); + 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((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", + 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", + 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)); + EXTRACT_BE_U_4(nr->octets), buf); } return; trunc: - ND_PRINT((ndo, "[|cnfp]")); + nd_print_trunc(ndo); return; } @@ -369,15 +379,15 @@ cnfp_v6_print(netdissect_options *ndo, const u_char *cp) t = EXTRACT_BE_U_4(nh->utc_sec); #endif - ND_PRINT((ndo, "NetFlow v%x, %u.%03u uptime, %u.%09u, ", ver, + 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))); + EXTRACT_BE_U_4(nh->utc_sec), EXTRACT_BE_U_4(nh->utc_nsec)); - ND_PRINT((ndo, "#%u, ", EXTRACT_BE_U_4(nh->sequence))); + ND_PRINT("#%u, ", EXTRACT_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]; @@ -387,60 +397,65 @@ cnfp_v6_print(netdissect_options *ndo, const u_char *cp) * Make sure we have the entire record. */ ND_TCHECK_SIZE(nr); - ND_PRINT((ndo, "\n started %u.%03u, last %u.%03u", + 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)); + EXTRACT_BE_U_4(nr->last_time)%1000); asbuf[0] = buf[0] = '\0'; - snprintf(buf, sizeof(buf), "/%u", EXTRACT_U_1(nr->src_mask)); - snprintf(asbuf, sizeof(asbuf), ":%u", + 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((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(EXTRACT_IPV4_TO_NETWORK_ORDER(nr->src_ina)), + buf, asbuf, + EXTRACT_BE_U_2(nr->srcport)); - snprintf(buf, sizeof(buf), "/%u", EXTRACT_U_1(nr->dst_mask)); - snprintf(asbuf, sizeof(asbuf), ":%u", + 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((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(EXTRACT_IPV4_TO_NETWORK_ORDER(nr->dst_ina)), + buf, asbuf, + EXTRACT_BE_U_2(nr->dstport)); - ND_PRINT((ndo, ">> %s\n ", intoa(nr->nhop_ina.s_addr))); + 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((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", + 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)", + 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((ndo, "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)); + EXTRACT_BE_U_4(nr->octets), buf); } return; trunc: - ND_PRINT((ndo, "[|cnfp]")); + nd_print_trunc(ndo); return; } @@ -452,6 +467,7 @@ cnfp_print(netdissect_options *ndo, const u_char *cp) /* * First 2 bytes are the version number. */ + ndo->ndo_protocol = "cnfp"; ND_TCHECK_2(cp); ver = EXTRACT_BE_U_2(cp); switch (ver) { @@ -469,12 +485,12 @@ 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]")); + nd_print_trunc(ndo); return; }