Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
VXLAN: Allow user to specify a custom vxlan tunnel instance id.
[vpp.git]
/
src
/
vnet
/
vxlan
/
vxlan_api.c
diff --git
a/src/vnet/vxlan/vxlan_api.c
b/src/vnet/vxlan/vxlan_api.c
index
20034f7
..
8b19c3a
100644
(file)
--- a/
src/vnet/vxlan/vxlan_api.c
+++ b/
src/vnet/vxlan/vxlan_api.c
@@
-70,10
+70,11
@@
static void vl_api_vxlan_add_del_tunnel_t_handler
{
vl_api_vxlan_add_del_tunnel_reply_t *rmp;
int rv = 0;
{
vl_api_vxlan_add_del_tunnel_reply_t *rmp;
int rv = 0;
-
ip4_main_t *im = &ip4_main
;
+
u32 fib_index
;
- uword *p = hash_get (im->fib_index_by_table_id, ntohl (mp->encap_vrf_id));
- if (!p)
+ fib_index = fib_table_find (fib_ip_proto (mp->is_ipv6),
+ ntohl (mp->encap_vrf_id));
+ if (fib_index == ~0)
{
rv = VNET_API_ERROR_NO_SUCH_FIB;
goto out;
{
rv = VNET_API_ERROR_NO_SUCH_FIB;
goto out;
@@
-82,8
+83,9
@@
static void vl_api_vxlan_add_del_tunnel_t_handler
vnet_vxlan_add_del_tunnel_args_t a = {
.is_add = mp->is_add,
.is_ip6 = mp->is_ipv6,
vnet_vxlan_add_del_tunnel_args_t a = {
.is_add = mp->is_add,
.is_ip6 = mp->is_ipv6,
+ .instance = ntohl (mp->instance),
.mcast_sw_if_index = ntohl (mp->mcast_sw_if_index),
.mcast_sw_if_index = ntohl (mp->mcast_sw_if_index),
- .encap_fib_index =
p[0]
,
+ .encap_fib_index =
fib_index
,
.decap_next_index = ntohl (mp->decap_next_index),
.vni = ntohl (mp->vni),
.dst = to_ip46 (mp->is_ipv6, mp->dst_address),
.decap_next_index = ntohl (mp->decap_next_index),
.vni = ntohl (mp->vni),
.dst = to_ip46 (mp->is_ipv6, mp->dst_address),
@@
-116,7
+118,7
@@
out:
}
static void send_vxlan_tunnel_details
}
static void send_vxlan_tunnel_details
- (vxlan_tunnel_t * t,
svm_queue_t * q
, u32 context)
+ (vxlan_tunnel_t * t,
vl_api_registration_t * reg
, u32 context)
{
vl_api_vxlan_tunnel_details_t *rmp;
ip4_main_t *im4 = &ip4_main;
{
vl_api_vxlan_tunnel_details_t *rmp;
ip4_main_t *im4 = &ip4_main;
@@
-138,6
+140,8
@@
static void send_vxlan_tunnel_details
memcpy (rmp->dst_address, t->dst.ip4.as_u8, 4);
rmp->encap_vrf_id = htonl (im4->fibs[t->encap_fib_index].ft_table_id);
}
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->instance = htonl (t->user_instance);
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->mcast_sw_if_index = htonl (t->mcast_sw_if_index);
rmp->vni = htonl (t->vni);
rmp->decap_next_index = htonl (t->decap_next_index);
@@
-145,22
+149,20
@@
static void send_vxlan_tunnel_details
rmp->is_ipv6 = is_ipv6;
rmp->context = context;
rmp->is_ipv6 = is_ipv6;
rmp->context = context;
- vl_
msg_api_send_shmem (q, (u8 *) &
rmp);
+ vl_
api_send_msg (reg, (u8 *)
rmp);
}
static void vl_api_vxlan_tunnel_dump_t_handler
(vl_api_vxlan_tunnel_dump_t * mp)
{
}
static void vl_api_vxlan_tunnel_dump_t_handler
(vl_api_vxlan_tunnel_dump_t * mp)
{
-
svm_queue_t *q
;
+
vl_api_registration_t *reg
;
vxlan_main_t *vxm = &vxlan_main;
vxlan_tunnel_t *t;
u32 sw_if_index;
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;
- }
+ reg = vl_api_client_index_to_registration (mp->client_index);
+ if (!reg)
+ return;
sw_if_index = ntohl (mp->sw_if_index);
sw_if_index = ntohl (mp->sw_if_index);
@@
-169,7
+171,7
@@
static void vl_api_vxlan_tunnel_dump_t_handler
/* *INDENT-OFF* */
pool_foreach (t, vxm->tunnels,
({
/* *INDENT-OFF* */
pool_foreach (t, vxm->tunnels,
({
- send_vxlan_tunnel_details(t,
q
, mp->context);
+ send_vxlan_tunnel_details(t,
reg
, mp->context);
}));
/* *INDENT-ON* */
}
}));
/* *INDENT-ON* */
}
@@
-181,7
+183,7
@@
static void vl_api_vxlan_tunnel_dump_t_handler
return;
}
t = &vxm->tunnels[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);
+ send_vxlan_tunnel_details (t,
reg
, mp->context);
}
}
}
}