misc: fix api in ipfix_classify_table_add/details

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

diff --git a/src/vnet/ipfix-export/flow_api.c b/src/vnet/ipfix-export/flow_api.c
index 84babe7..f4b3fc8 100644 (file)
--- a/src/vnet/ipfix-export/flow_api.c
+++ b/src/vnet/ipfix-export/flow_api.c
@@ -20,6 +20,7 @@
 #include <vnet/vnet.h>
 #include <vlibmemory/api.h>
 #include <vnet/ip/ip_types_api.h>
+#include <vnet/udp/udp_local.h>
 
 #include <vnet/interface.h>
 #include <vnet/api_errno.h>
@@ -113,13 +114,7 @@ vl_api_set_ipfix_exporter_t_handler (vl_api_set_ipfix_exporter_t * mp)
     template_interval = 20;
   udp_checksum = mp->udp_checksum;
 
-  if (collector.as_u32 == 0)
-    {
-      rv = VNET_API_ERROR_INVALID_VALUE;
-      goto out;
-    }
-
-  if (src.as_u32 == 0)
+  if (collector.as_u32 != 0 && src.as_u32 == 0)
     {
       rv = VNET_API_ERROR_INVALID_VALUE;
       goto out;
@@ -269,8 +264,8 @@ static void
     return;
 
   classify_table_index = ntohl (mp->table_id);
-  ip_version = ntohl (mp->ip_version);
-  transport_protocol = ntohl (mp->transport_protocol);
+  ip_version = (mp->ip_version == ADDRESS_IP4) ? 4 : 6;
+  transport_protocol = mp->transport_protocol;
   is_add = mp->is_add;
 
   if (fcm->src_port == 0)
@@ -345,8 +340,8 @@ send_ipfix_classify_table_details (u32 table_index,
   mp->_vl_msg_id = ntohs (VL_API_IPFIX_CLASSIFY_TABLE_DETAILS);
   mp->context = context;
   mp->table_id = htonl (table->classify_table_index);
-  mp->ip_version = htonl (table->ip_version);
-  mp->transport_protocol = htonl (table->transport_protocol);
+  mp->ip_version = (table->ip_version == 4) ? ADDRESS_IP4 : ADDRESS_IP6;
+  mp->transport_protocol = table->transport_protocol;
 
   vl_api_send_msg (reg, (u8 *) mp);
 }