/*
- * Copyright (c) 2017 Cisco and/or its affiliates.
+ * Copyright (c) 2018-2019 Cisco and/or its affiliates.
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at:
#include <vnet/vnet.h>
#include <vlibmemory/api.h>
+#include <vnet/udp/udp_local.h>
#include <vnet/udp/udp_encap.h>
#include <vnet/fib/fib_table.h>
+#include <vnet/ip/ip_types_api.h>
+#include <vnet/udp/udp.h>
-#include <vnet/vnet_msg_enum.h>
-
-#define vl_typedefs /* define message structures */
-#include <vnet/vnet_all_api_h.h>
-#undef vl_typedefs
-
-#define vl_endianfun /* define message structures */
-#include <vnet/vnet_all_api_h.h>
-#undef vl_endianfun
-
-/* instantiate all the print functions we know about */
-#define vl_print(handle, ...) vlib_cli_output (handle, __VA_ARGS__)
-#define vl_printfun
-#include <vnet/vnet_all_api_h.h>
-#undef vl_printfun
+#include <vnet/format_fns.h>
+#include <vnet/udp/udp.api_enum.h>
+#include <vnet/udp/udp.api_types.h>
+#define REPLY_MSG_ID_BASE udp_main.msg_id_base
#include <vlibapi/api_helper_macros.h>
-
-#define foreach_udp_api_msg \
- _(UDP_ENCAP_ADD_DEL, udp_encap_add_del) \
-_(UDP_ENCAP_DUMP, udp_encap_dump)
-
static void
-send_udp_encap_details (const udp_encap_t * ue,
- unix_shared_memory_queue_t * q, u32 context)
+send_udp_encap_details (const udp_encap_t * ue, vl_api_registration_t * reg,
+ u32 context)
{
vl_api_udp_encap_details_t *mp;
- fib_table_t *fib_table;
mp = vl_msg_api_alloc (sizeof (*mp));
- memset (mp, 0, sizeof (*mp));
- mp->_vl_msg_id = ntohs (VL_API_UDP_ENCAP_DETAILS);
+ clib_memset (mp, 0, sizeof (*mp));
+ mp->_vl_msg_id = ntohs (REPLY_MSG_ID_BASE + VL_API_UDP_ENCAP_DETAILS);
mp->context = context;
- mp->is_ip6 = (ue->ue_ip_proto == FIB_PROTOCOL_IP6);
-
if (FIB_PROTOCOL_IP4 == ue->ue_ip_proto)
{
- clib_memcpy (mp->src_ip, &ue->ue_hdrs.ip4.ue_ip4.src_address, 4);
- clib_memcpy (mp->dst_ip, &ue->ue_hdrs.ip4.ue_ip4.dst_address, 4);
- mp->src_port = htons (ue->ue_hdrs.ip4.ue_udp.src_port);
- mp->dst_port = htons (ue->ue_hdrs.ip4.ue_udp.dst_port);
+ clib_memcpy (&mp->udp_encap.src_ip.un.ip4,
+ &ue->ue_hdrs.ip4.ue_ip4.src_address, 4);
+ clib_memcpy (&mp->udp_encap.dst_ip.un.ip4,
+ &ue->ue_hdrs.ip4.ue_ip4.dst_address, 4);
+ mp->udp_encap.dst_ip.af = ip_address_family_encode (AF_IP4);
+ mp->udp_encap.src_ip.af = ip_address_family_encode (AF_IP4);
+
+ /* ports aren't byte swapped because they are stored in network
+ * byte order */
+ mp->udp_encap.src_port = ue->ue_hdrs.ip4.ue_udp.src_port;
+ mp->udp_encap.dst_port = ue->ue_hdrs.ip4.ue_udp.dst_port;
}
else
{
- clib_memcpy (mp->src_ip, &ue->ue_hdrs.ip6.ue_ip6.src_address, 16);
- clib_memcpy (mp->dst_ip, &ue->ue_hdrs.ip6.ue_ip6.dst_address, 16);
- mp->src_port = htons (ue->ue_hdrs.ip6.ue_udp.src_port);
- mp->dst_port = htons (ue->ue_hdrs.ip6.ue_udp.dst_port);
+ clib_memcpy (&mp->udp_encap.src_ip.un.ip6,
+ &ue->ue_hdrs.ip6.ue_ip6.src_address, 16);
+ clib_memcpy (&mp->udp_encap.dst_ip.un.ip6,
+ &ue->ue_hdrs.ip6.ue_ip6.dst_address, 16);
+ mp->udp_encap.dst_ip.af = ip_address_family_encode (AF_IP6);
+ mp->udp_encap.src_ip.af = ip_address_family_encode (AF_IP6);
+
+ /* ports aren't byte swapped because they are stored in network
+ * byte order */
+ mp->udp_encap.src_port = ue->ue_hdrs.ip6.ue_udp.src_port;
+ mp->udp_encap.dst_port = ue->ue_hdrs.ip6.ue_udp.dst_port;
}
- fib_table = fib_table_get (ue->ue_fib_index, ue->ue_ip_proto);
- mp->table_id = htonl (fib_table->ft_table_id);
- mp->id = htonl (ue->ue_id);
+ mp->udp_encap.table_id =
+ htonl (fib_table_get_table_id (ue->ue_fib_index, ue->ue_ip_proto));
+ mp->udp_encap.id = htonl (ue - udp_encap_pool);
- vl_msg_api_send_shmem (q, (u8 *) & mp);
+ vl_api_send_msg (reg, (u8 *) mp);
}
static void
-vl_api_udp_encap_dump_t_handler (vl_api_udp_encap_dump_t * mp,
- vlib_main_t * vm)
+vl_api_udp_encap_dump_t_handler (vl_api_udp_encap_dump_t *mp)
{
- unix_shared_memory_queue_t *q;
+ vl_api_registration_t *reg;
udp_encap_t *ue;
- q = vl_api_client_index_to_input_queue (mp->client_index);
- if (q == 0)
+ reg = vl_api_client_index_to_registration (mp->client_index);
+ if (!reg)
return;
/* *INDENT-OFF* */
- pool_foreach(ue, udp_encap_pool,
- ({
- send_udp_encap_details(ue, q, mp->context);
- }));
- /* *INDENT-OFF* */
+ pool_foreach (ue, udp_encap_pool)
+ {
+ send_udp_encap_details(ue, reg, mp->context);
+ }
+ /* *INDENT-ON* */
}
static void
-vl_api_udp_encap_add_del_t_handler (vl_api_udp_encap_add_del_t * mp,
- vlib_main_t * vm)
+vl_api_udp_encap_add_t_handler (vl_api_udp_encap_add_t *mp)
{
- vl_api_udp_encap_add_del_reply_t *rmp;
+ vl_api_udp_encap_add_reply_t *rmp;
ip46_address_t src_ip, dst_ip;
- u32 fib_index, table_id, ue_id;
+ udp_encap_fixup_flags_t flags;
+ u32 fib_index, table_id;
fib_protocol_t fproto;
+ ip46_type_t itype;
+ index_t uei;
int rv = 0;
- ue_id = ntohl(mp->id);
- table_id = ntohl(mp->table_id);
- fproto = (mp->is_ip6 ? FIB_PROTOCOL_IP6 : FIB_PROTOCOL_IP4);
+ uei = INDEX_INVALID;
+ table_id = ntohl (mp->udp_encap.table_id);
- fib_index = fib_table_find(fproto, table_id);
+ itype = ip_address_decode (&mp->udp_encap.src_ip, &src_ip);
+ itype = ip_address_decode (&mp->udp_encap.dst_ip, &dst_ip);
+ fproto = fib_proto_from_ip46 (itype);
+ fib_index = fib_table_find (fproto, table_id);
if (~0 == fib_index)
{
goto done;
}
- if (FIB_PROTOCOL_IP4 == fproto)
- {
- clib_memcpy(&src_ip.ip4, mp->src_ip, 4);
- clib_memcpy(&dst_ip.ip4, mp->dst_ip, 4);
- }
- else
- {
- clib_memcpy(&src_ip.ip6, mp->src_ip, 16);
- clib_memcpy(&dst_ip.ip6, mp->dst_ip, 16);
- }
+ flags = UDP_ENCAP_FIXUP_NONE;
+ if (mp->udp_encap.src_port == 0)
+ flags |= UDP_ENCAP_FIXUP_UDP_SRC_PORT_ENTROPY;
- if (mp->is_add)
- {
- udp_encap_add_and_lock(ue_id, fproto, fib_index,
- &src_ip, &dst_ip,
- ntohs(mp->src_port),
- ntohs(mp->dst_port),
- UDP_ENCAP_FIXUP_NONE);
- }
- else
- {
- udp_encap_unlock(ue_id);
- }
+ uei = udp_encap_add_and_lock (fproto, fib_index, &src_ip, &dst_ip,
+ ntohs (mp->udp_encap.src_port),
+ ntohs (mp->udp_encap.dst_port), flags);
+
+done:
+ /* *INDENT-OFF* */
+ REPLY_MACRO2 (VL_API_UDP_ENCAP_ADD_REPLY,
+ ({
+ rmp->id = ntohl (uei);
+ }));
+ /* *INDENT-ON* */
- done:
- REPLY_MACRO (VL_API_UDP_ENCAP_ADD_DEL_REPLY);
}
-#define vl_msg_name_crc_list
-#include <vnet/udp/udp.api.h>
-#undef vl_msg_name_crc_list
+static void
+vl_api_udp_encap_del_t_handler (vl_api_udp_encap_del_t *mp)
+{
+ vl_api_udp_encap_del_reply_t *rmp;
+ int rv = 0;
+
+ udp_encap_unlock (ntohl (mp->id));
+
+ REPLY_MACRO (VL_API_UDP_ENCAP_DEL_REPLY);
+}
+
+u32
+udp_api_decap_proto_to_index (vlib_main_t *vm,
+ vl_api_udp_decap_next_proto_t iproto)
+{
+ switch (iproto)
+ {
+ case UDP_API_DECAP_PROTO_IP4:
+ return vlib_get_node_by_name (vm, (u8 *) "ip4-input")->index;
+ case UDP_API_DECAP_PROTO_IP6:
+ return vlib_get_node_by_name (vm, (u8 *) "ip6-input")->index;
+ case UDP_API_DECAP_PROTO_MPLS:
+ return vlib_get_node_by_name (vm, (u8 *) "mpls-input")->index;
+ }
+ return ~0;
+}
static void
-setup_message_id_table (api_main_t * am)
+vl_api_udp_decap_add_del_t_handler (vl_api_udp_decap_add_del_t *mp)
{
-#define _(id,n,crc) vl_msg_api_add_msg_name_crc (am, #n "_" #crc, id);
- foreach_vl_msg_name_crc_udp;
-#undef _
+ vl_api_udp_decap_add_del_reply_t *rmp;
+ vlib_main_t *vm = vlib_get_main ();
+ int rv = 0;
+
+ if (mp->is_add)
+ {
+ u32 node_index =
+ udp_api_decap_proto_to_index (vm, ntohl (mp->udp_decap.next_proto));
+ if (node_index == ~0)
+ rv = VNET_API_ERROR_INVALID_PROTOCOL;
+ else
+ udp_register_dst_port (vm, ntohs (mp->udp_decap.port), node_index,
+ mp->udp_decap.is_ip4);
+ }
+ else
+ udp_unregister_dst_port (vm, ntohs (mp->udp_decap.port),
+ mp->udp_decap.is_ip4);
+ REPLY_MACRO (VL_API_UDP_DECAP_ADD_DEL_REPLY);
}
+#include <vnet/udp/udp.api.c>
static clib_error_t *
udp_api_hookup (vlib_main_t * vm)
{
- api_main_t *am = &api_main;
-
-#define _(N,n) \
- vl_msg_api_set_handlers(VL_API_##N, #n, \
- vl_api_##n##_t_handler, \
- vl_noop_handler, \
- vl_api_##n##_t_endian, \
- vl_api_##n##_t_print, \
- sizeof(vl_api_##n##_t), 1);
- foreach_udp_api_msg;
-#undef _
+ api_main_t *am = vlibapi_get_main ();
/*
* Set up the (msg_name, crc, message-id) table
*/
- setup_message_id_table (am);
+ REPLY_MSG_ID_BASE = setup_message_id_table ();
+
+ /* Mark these APIs as mp safe */
+ vl_api_set_msg_thread_safe (am, REPLY_MSG_ID_BASE + VL_API_UDP_ENCAP_ADD, 1);
+ vl_api_set_msg_thread_safe (am, REPLY_MSG_ID_BASE + VL_API_UDP_ENCAP_DEL, 1);
+ vl_api_set_msg_thread_safe (am, REPLY_MSG_ID_BASE + VL_API_UDP_ENCAP_DUMP,
+ 1);
return 0;
}