#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>
_(SET_IPFIX_CLASSIFY_STREAM, set_ipfix_classify_stream) \
_(IPFIX_CLASSIFY_STREAM_DUMP, ipfix_classify_stream_dump) \
_(IPFIX_CLASSIFY_TABLE_ADD_DEL, ipfix_classify_table_add_del) \
-_(IPFIX_CLASSIFY_TABLE_DUMP, ipfix_classify_table_dump)
+_(IPFIX_CLASSIFY_TABLE_DUMP, ipfix_classify_table_dump) \
+_(IPFIX_FLUSH, ipfix_flush)
static void
vl_api_set_ipfix_exporter_t_handler (vl_api_set_ipfix_exporter_t * mp)
{
vlib_main_t *vm = vlib_get_main ();
flow_report_main_t *frm = &flow_report_main;
+ vl_api_registration_t *reg;
vl_api_set_ipfix_exporter_reply_t *rmp;
ip4_address_t collector, src;
u16 collector_port = UDP_DST_PORT_ipfix;
u32 fib_index = ~0;
int rv = 0;
- memcpy (collector.data, mp->collector_address, sizeof (collector.data));
+ reg = vl_api_client_index_to_registration (mp->client_index);
+ if (!reg)
+ return;
+
+ if (mp->src_address.af == ADDRESS_IP6
+ || mp->collector_address.af == ADDRESS_IP6)
+ {
+ rv = VNET_API_ERROR_UNIMPLEMENTED;
+ goto out;
+ }
+
+ ip4_address_decode (mp->collector_address.un.ip4, &collector);
collector_port = ntohs (mp->collector_port);
if (collector_port == (u16) ~ 0)
collector_port = UDP_DST_PORT_ipfix;
- memcpy (src.data, mp->src_address, sizeof (src.data));
+ ip4_address_decode (mp->src_address.un.ip4, &src);
fib_id = ntohl (mp->vrf_id);
ip4_main_t *im = &ip4_main;
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;
vl_api_registration_t *reg;
vl_api_ipfix_exporter_details_t *rmp;
ip4_main_t *im = &ip4_main;
+ ip46_address_t collector = {.as_u64[0] = 0,.as_u64[1] = 0 };
+ ip46_address_t src = {.as_u64[0] = 0,.as_u64[1] = 0 };
u32 vrf_id;
reg = vl_api_client_index_to_registration (mp->client_index);
if (!reg)
- return;;
+ return;
rmp = vl_msg_api_alloc (sizeof (*rmp));
- memset (rmp, 0, sizeof (*rmp));
+ clib_memset (rmp, 0, sizeof (*rmp));
rmp->_vl_msg_id = ntohs (VL_API_IPFIX_EXPORTER_DETAILS);
rmp->context = mp->context;
- memcpy (rmp->collector_address, frm->ipfix_collector.data,
- sizeof (frm->ipfix_collector.data));
+
+ memcpy (&collector.ip4, &frm->ipfix_collector, sizeof (ip4_address_t));
+ ip_address_encode (&collector, IP46_TYPE_IP4, &rmp->collector_address);
+
rmp->collector_port = htons (frm->collector_port);
- memcpy (rmp->src_address, frm->src_address.data,
- sizeof (frm->src_address.data));
+
+ memcpy (&src.ip4, &frm->src_address, sizeof (ip4_address_t));
+ ip_address_encode (&src, IP46_TYPE_IP4, &rmp->src_address);
+
if (frm->fib_index == ~0)
vrf_id = ~0;
else
return;
rmp = vl_msg_api_alloc (sizeof (*rmp));
- memset (rmp, 0, sizeof (*rmp));
+ clib_memset (rmp, 0, sizeof (*rmp));
rmp->_vl_msg_id = ntohs (VL_API_IPFIX_CLASSIFY_STREAM_DETAILS);
rmp->context = mp->context;
rmp->domain_id = htonl (fcm->domain_id);
(vl_api_ipfix_classify_table_add_del_t * mp)
{
vl_api_ipfix_classify_table_add_del_reply_t *rmp;
+ vl_api_registration_t *reg;
flow_report_classify_main_t *fcm = &flow_report_classify_main;
flow_report_main_t *frm = &flow_report_main;
vnet_flow_report_add_del_args_t args;
u8 transport_protocol;
int rv = 0;
+ reg = vl_api_client_index_to_registration (mp->client_index);
+ if (!reg)
+ return;
+
classify_table_index = ntohl (mp->table_id);
- ip_version = mp->ip_version;
+ ip_version = (mp->ip_version == ADDRESS_IP4) ? 4 : 6;
transport_protocol = mp->transport_protocol;
is_add = mp->is_add;
goto out;
}
- memset (&args, 0, sizeof (args));
+ clib_memset (&args, 0, sizeof (args));
table = 0;
int i;
ipfix_classify_table_t *table = &fcm->tables[table_index];
mp = vl_msg_api_alloc (sizeof (*mp));
- memset (mp, 0, sizeof (*mp));
+ clib_memset (mp, 0, sizeof (*mp));
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 = table->ip_version;
+ mp->ip_version = (table->ip_version == 4) ? ADDRESS_IP4 : ADDRESS_IP6;
mp->transport_protocol = table->transport_protocol;
vl_api_send_msg (reg, (u8 *) mp);
send_ipfix_classify_table_details (i, reg, mp->context);
}
+static void
+vl_api_ipfix_flush_t_handler (vl_api_ipfix_flush_t * mp)
+{
+ vl_api_ipfix_flush_reply_t *rmp;
+ vl_api_registration_t *reg;
+ vlib_main_t *vm = vlib_get_main ();
+ int rv = 0;
+
+ reg = vl_api_client_index_to_registration (mp->client_index);
+ if (!reg)
+ return;
+
+ /* poke the flow reporting process */
+ vlib_process_signal_event (vm, flow_report_process_node.index,
+ 1 /* type_opaque */ , 0 /* data */ );
+
+ REPLY_MACRO (VL_API_IPFIX_FLUSH_REPLY);
+}
+
/*
* flow_api_hookup
* Add vpe's API message handlers to the table.
- * vlib has alread mapped shared memory and
+ * vlib has already mapped shared memory and
* added the client registration handlers.
* See .../vlib-api/vlibmemory/memclnt_vlib.c:memclnt_process()
*/
static clib_error_t *
flow_api_hookup (vlib_main_t * vm)
{
- api_main_t *am = &api_main;
+ api_main_t *am = vlibapi_get_main ();
#define _(N,n) \
vl_msg_api_set_handlers(VL_API_##N, #n, \