ipfix-export: refactor params to the callback fns

[vpp.git] / src / vnet / ipfix-export / flow_report.c

diff --git a/src/vnet/ipfix-export/flow_report.c b/src/vnet/ipfix-export/flow_report.c
index 55c3b4d..d2532f9 100644 (file)
--- a/src/vnet/ipfix-export/flow_report.c
+++ b/src/vnet/ipfix-export/flow_report.c
@@ -101,8 +101,8 @@ send_template_packet (flow_report_main_t *frm, ipfix_exporter_t *exp,
   if (fr->update_rewrite)
     {
       fr->rewrite = fr->rewrite_callback (
-       exp, fr, &exp->ipfix_collector, &exp->src_address, exp->collector_port,
-       fr->report_elements, fr->n_report_elements, fr->stream_indexp);
+       exp, fr, exp->collector_port, fr->report_elements,
+       fr->n_report_elements, fr->stream_indexp);
       fr->update_rewrite = 0;
     }
 
@@ -156,8 +156,6 @@ send_template_packet (flow_report_main_t *frm, ipfix_exporter_t *exp,
 
 u8 *
 vnet_flow_rewrite_generic_callback (ipfix_exporter_t *exp, flow_report_t *fr,
-                                   ip4_address_t *collector_address,
-                                   ip4_address_t *src_address,
                                    u16 collector_port,
                                    ipfix_report_element_t *report_elts,
                                    u32 n_elts, u32 *stream_indexp)
@@ -200,8 +198,8 @@ vnet_flow_rewrite_generic_callback (ipfix_exporter_t *exp, flow_report_t *fr,
   ip->ip_version_and_header_length = 0x45;
   ip->ttl = 254;
   ip->protocol = IP_PROTOCOL_UDP;
-  ip->src_address.as_u32 = src_address->as_u32;
-  ip->dst_address.as_u32 = collector_address->as_u32;
+  ip->src_address.as_u32 = exp->src_address.as_u32;
+  ip->dst_address.as_u32 = exp->ipfix_collector.as_u32;
   udp->src_port = clib_host_to_net_u16 (stream->src_port);
   udp->dst_port = clib_host_to_net_u16 (collector_port);
   udp->length = clib_host_to_net_u16 (vec_len (rewrite) - sizeof (*ip));