ligang/vpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

API refactoring : vxlan

Browse Source 
Change-Id: Ied105d738ba3625086359b267db0390be842b7bc
Signed-off-by: Pavel Kotucek <pkotucek@cisco.com>
This commit is contained in:
Pavel Kotucek
2016-12-19 14:35:35 +01:00
committed by Damjan Marion
parent 2e70d8b31d
commit adb13d69ad
6 changed files with 348 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
vnet/Makefile.am
View File

@ -27,7 +27,9 @@ BUILT_SOURCES = \
vnet/span/span.api.h \
vnet/span/span.api.json \
vnet/unix/tap.api.h \
vnet/unix/tap.api.json
vnet/unix/tap.api.json \
vnet/vxlan/vxlan.api.h \
vnet/vxlan/vxlan.api.json
libvnet_la_SOURCES =
libvnetplugin_la_SOURCES =
@ -232,12 +234,14 @@ nobase_include_HEADERS += \
libvnet_la_SOURCES += \
vnet/vxlan/vxlan.c \
vnet/vxlan/encap.c \
vnet/vxlan/decap.c
vnet/vxlan/decap.c \
vnet/vxlan/vxlan_api.c
nobase_include_HEADERS += \
vnet/vxlan/vxlan.h \
vnet/vxlan/vxlan_packet.h \
vnet/vxlan/vxlan_error.def
vnet/vxlan/vxlan_error.def \
vnet/vxlan/vxlan.api.h
########################################
# Layer 2 / CDP
@ -939,7 +943,8 @@ api_DATA = \
vnet/l2/l2.api.json \
vnet/map/map.api.json \
vnet/span/span.api.json \
vnet/unix/tap.api.json
vnet/unix/tap.api.json \
vnet/vxlan/vxlan.api.json
# The actual %.api.h rule is in .../build-data/packages/suffix-rules.mk
# and requires a symbolic link at the top of the vnet source tree

1
vnet/vnet/vnet_all_api_h.h
View File

@ -35,6 +35,7 @@
#include <vnet/span/span.api.h>
#include <vnet/ip/ip.api.h>
#include <vnet/unix/tap.api.h>
#include <vnet/vxlan/vxlan.api.h>
/*
* fd.io coding-style-patch-verification: ON

81
vnet/vnet/vxlan/vxlan.api Normal file
View File

@ -0,0 +1,81 @@
/*
* Copyright (c) 2015-2016 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:
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
define vxlan_add_del_tunnel
{
u32 client_index;
u32 context;
u8 is_add;
u8 is_ipv6;
u8 src_address[16];
u8 dst_address[16];
u32 mcast_sw_if_index;
u32 encap_vrf_id;
u32 decap_next_index;
u32 vni;
};
define vxlan_add_del_tunnel_reply
{
u32 context;
i32 retval;
u32 sw_if_index;
};
define vxlan_tunnel_dump
{
u32 client_index;
u32 context;
u32 sw_if_index;
};
define vxlan_tunnel_details
{
u32 context;
u32 sw_if_index;
u8 src_address[16];
u8 dst_address[16];
u32 mcast_sw_if_index;
u32 encap_vrf_id;
u32 decap_next_index;
u32 vni;
u8 is_ipv6;
};
/** \brief Interface set vxlan-bypass request
@param client_index - opaque cookie to identify the sender
@param context - sender context, to match reply w/ request
@param sw_if_index - interface used to reach neighbor
@param is_ipv6 - if non-zero, enable ipv6-vxlan-bypass, else ipv4-vxlan-bypass
@param enable - if non-zero enable, else disable
*/
define sw_interface_set_vxlan_bypass
{
u32 client_index;
u32 context;
u32 sw_if_index;
u8 is_ipv6;
u8 enable;
};
/** \brief Interface set vxlan-bypass response
@param context - sender context, to match reply w/ request
@param retval - return code for the request
*/
define sw_interface_set_vxlan_bypass_reply
{
u32 context;
i32 retval;
};

253
vnet/vnet/vxlan/vxlan_api.c Normal file
View File

@ -0,0 +1,253 @@
/*
*------------------------------------------------------------------
* vxlan_api.c - vxlan api
*
* Copyright (c) 2016 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:
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*------------------------------------------------------------------
*/
#include <vnet/vnet.h>
#include <vlibmemory/api.h>
#include <vnet/interface.h>
#include <vnet/api_errno.h>
#include <vnet/feature/feature.h>
#include <vnet/vxlan/vxlan.h>
#include <vnet/fib/fib_table.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 <vlibapi/api_helper_macros.h>
#define foreach_vpe_api_msg \
_(SW_INTERFACE_SET_VXLAN_BYPASS, sw_interface_set_vxlan_bypass) \
_(VXLAN_ADD_DEL_TUNNEL, vxlan_add_del_tunnel) \
_(VXLAN_TUNNEL_DUMP, vxlan_tunnel_dump)
static void
vl_api_sw_interface_set_vxlan_bypass_t_handler
(vl_api_sw_interface_set_vxlan_bypass_t * mp)
{
vl_api_sw_interface_set_vxlan_bypass_reply_t *rmp;
int rv = 0;
u32 sw_if_index = ntohl (mp->sw_if_index);
VALIDATE_SW_IF_INDEX (mp);
if (mp->is_ipv6)
{
/* not yet implemented */
}
else
vnet_feature_enable_disable ("ip4-unicast", "ip4-vxlan-bypass",
sw_if_index, mp->enable, 0, 0);
BAD_SW_IF_INDEX_LABEL;
REPLY_MACRO (VL_API_SW_INTERFACE_SET_VXLAN_BYPASS_REPLY);
}
static void vl_api_vxlan_add_del_tunnel_t_handler
(vl_api_vxlan_add_del_tunnel_t * mp)
{
vl_api_vxlan_add_del_tunnel_reply_t *rmp;
int rv = 0;
vnet_vxlan_add_del_tunnel_args_t _a, *a = &_a;
u32 encap_fib_index;
uword *p;
ip4_main_t *im = &ip4_main;
vnet_main_t *vnm = vnet_get_main ();
u32 sw_if_index = ~0;
p = hash_get (im->fib_index_by_table_id, ntohl (mp->encap_vrf_id));
if (!p)
{
rv = VNET_API_ERROR_NO_SUCH_FIB;
goto out;
}
encap_fib_index = p[0];
memset (a, 0, sizeof (*a));
a->is_add = mp->is_add;
a->is_ip6 = mp->is_ipv6;
/* ip addresses sent in network byte order */
ip46_from_addr_buf (mp->is_ipv6, mp->dst_address, &a->dst);
ip46_from_addr_buf (mp->is_ipv6, mp->src_address, &a->src);
/* Check src & dst are different */
if (ip46_address_cmp (&a->dst, &a->src) == 0)
{
rv = VNET_API_ERROR_SAME_SRC_DST;
goto out;
}
a->mcast_sw_if_index = ntohl (mp->mcast_sw_if_index);
if (ip46_address_is_multicast (&a->dst) &&
pool_is_free_index (vnm->interface_main.sw_interfaces,
a->mcast_sw_if_index))
{
rv = VNET_API_ERROR_INVALID_SW_IF_INDEX;
goto out;
}
a->encap_fib_index = encap_fib_index;
a->decap_next_index = ntohl (mp->decap_next_index);
a->vni = ntohl (mp->vni);
rv = vnet_vxlan_add_del_tunnel (a, &sw_if_index);
out:
/* *INDENT-OFF* */
REPLY_MACRO2(VL_API_VXLAN_ADD_DEL_TUNNEL_REPLY,
({
rmp->sw_if_index = ntohl (sw_if_index);
}));
/* *INDENT-ON* */
}
static void send_vxlan_tunnel_details
(vxlan_tunnel_t * t, unix_shared_memory_queue_t * q, u32 context)
{
vl_api_vxlan_tunnel_details_t *rmp;
ip4_main_t *im4 = &ip4_main;
ip6_main_t *im6 = &ip6_main;
u8 is_ipv6 = !ip46_address_is_ip4 (&t->dst);
rmp = vl_msg_api_alloc (sizeof (*rmp));
memset (rmp, 0, sizeof (*rmp));
rmp->_vl_msg_id = ntohs (VL_API_VXLAN_TUNNEL_DETAILS);
if (is_ipv6)
{
memcpy (rmp->src_address, t->src.ip6.as_u8, 16);
memcpy (rmp->dst_address, t->dst.ip6.as_u8, 16);
rmp->encap_vrf_id = htonl (im6->fibs[t->encap_fib_index].ft_table_id);
}
else
{
memcpy (rmp->src_address, t->src.ip4.as_u8, 4);
memcpy (rmp->dst_address, t->dst.ip4.as_u8, 4);
rmp->encap_vrf_id = htonl (im4->fibs[t->encap_fib_index].ft_table_id);
}
rmp->mcast_sw_if_index = htonl (t->mcast_sw_if_index);
rmp->vni = htonl (t->vni);
rmp->decap_next_index = htonl (t->decap_next_index);
rmp->sw_if_index = htonl (t->sw_if_index);
rmp->is_ipv6 = is_ipv6;
rmp->context = context;
vl_msg_api_send_shmem (q, (u8 *) & rmp);
}
static void vl_api_vxlan_tunnel_dump_t_handler
(vl_api_vxlan_tunnel_dump_t * mp)
{
unix_shared_memory_queue_t *q;
vxlan_main_t *vxm = &vxlan_main;
vxlan_tunnel_t *t;
u32 sw_if_index;
q = vl_api_client_index_to_input_queue (mp->client_index);
if (q == 0)
{
return;
}
sw_if_index = ntohl (mp->sw_if_index);
if (~0 == sw_if_index)
{
/* *INDENT-OFF* */
pool_foreach (t, vxm->tunnels,
({
send_vxlan_tunnel_details(t, q, mp->context);
}));
/* *INDENT-ON* */
}
else
{
if ((sw_if_index >= vec_len (vxm->tunnel_index_by_sw_if_index)) ||
(~0 == vxm->tunnel_index_by_sw_if_index[sw_if_index]))
{
return;
}
t = &vxm->tunnels[vxm->tunnel_index_by_sw_if_index[sw_if_index]];
send_vxlan_tunnel_details (t, q, mp->context);
}
}
/*
* vpe_api_hookup
* Add vpe's API message handlers to the table.
* vlib has alread mapped shared memory and
* added the client registration handlers.
* See .../vlib-api/vlibmemory/memclnt_vlib.c:memclnt_process()
*/
#define vl_msg_name_crc_list
#include <vnet/vnet_all_api_h.h>
#undef vl_msg_name_crc_list
static void
setup_message_id_table (api_main_t * am)
{
#define _(id,n,crc) vl_msg_api_add_msg_name_crc (am, #n "_" #crc, id);
foreach_vl_msg_name_crc_vxlan;
#undef _
}
static clib_error_t *
vxlan_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_vpe_api_msg;
#undef _
am->api_trace_cfg[VL_API_VXLAN_ADD_DEL_TUNNEL].size += 16 * sizeof (u32);
/*
* Set up the (msg_name, crc, message-id) table
*/
setup_message_id_table (am);
return 0;
}
VLIB_API_INIT_FUNCTION (vxlan_api_hookup);
/*
* fd.io coding-style-patch-verification: ON
*
* Local Variables:
* eval: (c-set-style "gnu")
* End:
*/

4
vpp-api/java/Makefile.am
View File

@ -87,7 +87,8 @@ jvpp-core/io_fd_vpp_jvpp_core_JVppCoreImpl.h: \
jvpp-registry/io_fd_vpp_jvpp_VppJNIConnection.h \
$(prefix)/../vpp/vpp-api/vpe.api.json \
$(prefix)/../vnet/vnet/ip.api.json \
$(prefix)/../vnet/vnet/tap.api.json
$(prefix)/../vnet/vnet/tap.api.json \
$(prefix)/../vnet/vnet/vxlan.api.json
cp -rf @srcdir@/jvpp-core/* -t jvpp-core/
mkdir -p jvpp-core/target
cd jvpp-core \
@ -100,6 +101,7 @@ jvpp-core/io_fd_vpp_jvpp_core_JVppCoreImpl.h: \
$(prefix)/../vnet/vnet/ip.api.json \
$(prefix)/../vnet/vnet/span.api.json \
$(prefix)/../vnet/vnet/tap.api.json \
$(prefix)/../vnet/vnet/vxlan.api.json \
&& cp -rf types dto future callfacade callback notification *.java -t $(packagedir_jvpp_core) \
&& rm -rf types dto future callfacade callback notification *.java

68
vpp/vpp-api/vpe.api
View File

@ -25,6 +25,7 @@
* see .../vnet/vnet/{interface.api,interface_api.c}
* IP APIs: see .../vnet/vnet/ip/{ip.api, ip_api.c}
* TAP APIs: see .../vnet/vnet/unix/{tap.api, tap_api.c}
* VXLAN APIs: see .../vnet/vnet/vxlan/{vxlan.api, vxlan_api.c}
*/
/** \brief Create a new subinterface with the given vlan id
@ -904,32 +905,6 @@ define sw_interface_set_vpath_reply
i32 retval;
};
/** \brief Interface set vxlan-bypass request
@param client_index - opaque cookie to identify the sender
@param context - sender context, to match reply w/ request
@param sw_if_index - interface used to reach neighbor
@param is_ipv6 - if non-zero, enable ipv6-vxlan-bypass, else ipv4-vxlan-bypass
@param enable - if non-zero enable, else disable
*/
define sw_interface_set_vxlan_bypass
{
u32 client_index;
u32 context;
u32 sw_if_index;
u8 is_ipv6;
u8 enable;
};
/** \brief Interface set vxlan-bypass response
@param context - sender context, to match reply w/ request
@param retval - return code for the request
*/
define sw_interface_set_vxlan_bypass_reply
{
u32 context;
i32 retval;
};
/** \brief Set L2 XConnect between two interfaces request
@param client_index - opaque cookie to identify the sender
@param context - sender context, to match reply w/ request
@ -1498,47 +1473,6 @@ define l2tpv3_set_lookup_key_reply
i32 retval;
};
define vxlan_add_del_tunnel
{
u32 client_index;
u32 context;
u8 is_add;
u8 is_ipv6;
u8 src_address[16];
u8 dst_address[16];
u32 mcast_sw_if_index;
u32 encap_vrf_id;
u32 decap_next_index;
u32 vni;
};
define vxlan_add_del_tunnel_reply
{
u32 context;
i32 retval;
u32 sw_if_index;
};
define vxlan_tunnel_dump
{
u32 client_index;
u32 context;
u32 sw_if_index;
};
define vxlan_tunnel_details
{
u32 context;
u32 sw_if_index;
u8 src_address[16];
u8 dst_address[16];
u32 mcast_sw_if_index;
u32 encap_vrf_id;
u32 decap_next_index;
u32 vni;
u8 is_ipv6;
};
define gre_add_del_tunnel
{
u32 client_index;