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

mpls: add user defined name tag to mpls tunnels

Browse Source 
This allows a user creating MPLS tunnel through the bin_api to add a name tag. This is useful
to correlate the Tunnel with its use-case. Also useful if the user needs to recover the MPLS
Tunnel after a restart (mark-sweep).

Type: feature

Change-Id:

Signed-off-by: IJsbrand Wijnands <ice@cisco.com>
Change-Id: Idc080a63810a176ab090a2678a73d2cf9f7b523f
This commit is contained in:
IJsbrand Wijnands
2020-03-05 10:56:26 -08:00
committed by Neale Ranns
parent 287d5e109a
commit 39ae0a07ac
4 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/vnet/mpls/mpls.api
View File

@ -46,9 +46,11 @@ typedef mpls_tunnel
u32 mt_tunnel_index;
bool mt_l2_only;
bool mt_is_multicast;
string mt_tag[64];
u8 mt_n_paths;
vl_api_fib_path_t mt_paths[mt_n_paths];
};
define mpls_tunnel_add_del
{
u32 client_index;

4
src/vnet/mpls/mpls_api.c
View File

@ -283,7 +283,8 @@ vl_api_mpls_tunnel_add_del_t_handler (vl_api_mpls_tunnel_add_del_t * mp)
if (~0 == tunnel_sw_if_index)
tunnel_sw_if_index =
vnet_mpls_tunnel_create (mp->mt_tunnel.mt_l2_only,
mp->mt_tunnel.mt_is_multicast);
mp->mt_tunnel.mt_is_multicast,
mp->mt_tunnel.mt_tag);
vnet_mpls_tunnel_path_add (tunnel_sw_if_index, rpaths);
tunnel_index = vnet_mpls_tunnel_get_index (tunnel_sw_if_index);
@ -365,6 +366,7 @@ send_mpls_tunnel_entry (u32 mti, void *arg)
mp->mt_tunnel.mt_tunnel_index = ntohl (mti);
mp->mt_tunnel.mt_l2_only = ! !(MPLS_TUNNEL_FLAG_L2 & mt->mt_flags);
mp->mt_tunnel.mt_is_multicast = ! !(MPLS_TUNNEL_FLAG_MCAST & mt->mt_flags);
memcpy (mp->mt_tunnel.mt_tag, mt->mt_tag, sizeof (mp->mt_tunnel.mt_tag));
fib_path_list_walk_w_ext (mt->mt_path_list,
&mt->mt_path_exts, fib_path_encode, &path_ctx);

9
src/vnet/mpls/mpls_tunnel.c
View File

@ -606,7 +606,8 @@ vnet_mpls_tunnel_del (u32 sw_if_index)
u32
vnet_mpls_tunnel_create (u8 l2_only,
u8 is_multicast)
u8 is_multicast,
u8 *tag)
{
vnet_hw_interface_t * hi;
mpls_tunnel_t *mt;
@ -625,6 +626,10 @@ vnet_mpls_tunnel_create (u8 l2_only,
mt->mt_flags |= MPLS_TUNNEL_FLAG_MCAST;
if (l2_only)
mt->mt_flags |= MPLS_TUNNEL_FLAG_L2;
if (tag)
memcpy(mt->mt_tag, tag, sizeof(mt->mt_tag));
else
mt->mt_tag[0] = '\0';
/*
* Create a new tunnel HW interface
@ -858,7 +863,7 @@ vnet_create_mpls_tunnel_command_fn (vlib_main_t * vm,
if (~0 == sw_if_index)
{
sw_if_index = vnet_mpls_tunnel_create(l2_only, is_multicast);
sw_if_index = vnet_mpls_tunnel_create(l2_only, is_multicast, NULL);
}
vnet_mpls_tunnel_path_add(sw_if_index, rpaths);
}

8
src/vnet/mpls/mpls_tunnel.h
View File

@ -64,6 +64,11 @@ typedef struct mpls_tunnel_t_
*/
mpls_tunnel_flags_t mt_flags;
/**
* @brief User defined name tag for this MPLS Tunnel.
*/
u8 mt_tag[64];
/**
* @brief If the tunnel is an L2 tunnel, this is the link type ETHERNET
* load-balance
@ -101,7 +106,8 @@ typedef struct mpls_tunnel_t_
* @return the SW Interface index of the newly created tuneel
*/
extern u32 vnet_mpls_tunnel_create (u8 l2_only,
u8 is_multicast);
u8 is_multicast,
u8 *description);
/**
* @brief Add a path to an MPLS tunnel