From 5140484529d420af47d6aa8ffbe6818621d8b55f Mon Sep 17 00:00:00 2001 From: Paul Atkins Date: Mon, 4 Oct 2021 15:43:56 +0100 Subject: ipfix-export: Change exp to use ip_address Modify the ipfix_exporter to use ip_address instead of the ipv4 specific version. Modify the current code so that it writes into the v4 specific part of the address, i.e. we are not yet fully supporting IPv6. For the exporter configured via the original API (the one that is always in slot0) we will not support IPv6 addresses. Type: improvement Signed-off-by: Paul Atkins Change-Id: Ic9854ac62aaee76a7a55a958234c456fd9828c4c --- src/plugins/flowprobe/node.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/plugins/flowprobe/node.c') diff --git a/src/plugins/flowprobe/node.c b/src/plugins/flowprobe/node.c index 611ce62956b..928d75225d8 100644 --- a/src/plugins/flowprobe/node.c +++ b/src/plugins/flowprobe/node.c @@ -575,8 +575,8 @@ flowprobe_export_send (vlib_main_t * vm, vlib_buffer_t * b0, ip->ttl = 254; ip->protocol = IP_PROTOCOL_UDP; ip->flags_and_fragment_offset = 0; - ip->src_address.as_u32 = exp->src_address.as_u32; - ip->dst_address.as_u32 = exp->ipfix_collector.as_u32; + ip->src_address.as_u32 = exp->src_address.ip.ip4.as_u32; + ip->dst_address.as_u32 = exp->ipfix_collector.ip.ip4.as_u32; udp->src_port = clib_host_to_net_u16 (stream->src_port); udp->dst_port = clib_host_to_net_u16 (exp->collector_port); udp->checksum = 0; @@ -943,7 +943,8 @@ flowprobe_walker_process (vlib_main_t * vm, * $$$$ Remove this check from here and track FRM status and disable * this process if required. */ - if (exp->ipfix_collector.as_u32 == 0 || exp->src_address.as_u32 == 0) + if (ip_address_is_zero (&exp->ipfix_collector) || + ip_address_is_zero (&exp->src_address)) { fm->disabled = true; return 0; -- cgit 1.2.3-korg