Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
VPP-466: PG pg_create_interface API returns wrong interface index
[vpp.git]
/
vpp
/
vpp-api
/
api.c
diff --git
a/vpp/vpp-api/api.c
b/vpp/vpp-api/api.c
index
2fdf526
..
028e67b
100644
(file)
--- a/
vpp/vpp-api/api.c
+++ b/
vpp/vpp-api/api.c
@@
-3398,15
+3398,15
@@
static void vl_api_sw_interface_set_unnumbered_t_handler
{
si->flags |= VNET_SW_INTERFACE_FLAG_UNNUMBERED;
si->unnumbered_sw_if_index = sw_if_index;
{
si->flags |= VNET_SW_INTERFACE_FLAG_UNNUMBERED;
si->unnumbered_sw_if_index = sw_if_index;
- ip4_sw_interface_enable_disable (sw_if_index, 1);
- ip6_sw_interface_enable_disable (sw_if_index, 1);
+ ip4_sw_interface_enable_disable (
unnumbered_
sw_if_index, 1);
+ ip6_sw_interface_enable_disable (
unnumbered_
sw_if_index, 1);
}
else
{
si->flags &= ~(VNET_SW_INTERFACE_FLAG_UNNUMBERED);
si->unnumbered_sw_if_index = (u32) ~ 0;
}
else
{
si->flags &= ~(VNET_SW_INTERFACE_FLAG_UNNUMBERED);
si->unnumbered_sw_if_index = (u32) ~ 0;
- ip4_sw_interface_enable_disable (sw_if_index, 0);
- ip6_sw_interface_enable_disable (sw_if_index, 0);
+ ip4_sw_interface_enable_disable (
unnumbered_
sw_if_index, 0);
+ ip6_sw_interface_enable_disable (
unnumbered_
sw_if_index, 0);
}
done:
}
done:
@@
-8144,12
+8144,13
@@
vl_api_pg_create_interface_t_handler (vl_api_pg_create_interface_t * mp)
int rv = 0;
pg_main_t *pg = &pg_main;
int rv = 0;
pg_main_t *pg = &pg_main;
- u32 sw_if_index = pg_interface_add_or_get (pg, ntohl (mp->interface_id));
+ u32 pg_if_id = pg_interface_add_or_get (pg, ntohl (mp->interface_id));
+ pg_interface_t *pi = pool_elt_at_index (pg->interfaces, pg_if_id);
/* *INDENT-OFF* */
REPLY_MACRO2(VL_API_PG_CREATE_INTERFACE_REPLY,
({
/* *INDENT-OFF* */
REPLY_MACRO2(VL_API_PG_CREATE_INTERFACE_REPLY,
({
- rmp->sw_if_index = ntohl(sw_if_index);
+ rmp->sw_if_index = ntohl(
pi->
sw_if_index);
}));
/* *INDENT-ON* */
}
}));
/* *INDENT-ON* */
}