Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
avf: allocate descriptor memory from local numa
[vpp.git]
/
src
/
vnet
/
devices
/
tap
/
tapv2_api.c
diff --git
a/src/vnet/devices/tap/tapv2_api.c
b/src/vnet/devices/tap/tapv2_api.c
index
9f46884
..
e70d63f
100644
(file)
--- a/
src/vnet/devices/tap/tapv2_api.c
+++ b/
src/vnet/devices/tap/tapv2_api.c
@@
-52,14
+52,15
@@
_(SW_INTERFACE_TAP_V2_DUMP, sw_interface_tap_v2_dump)
static void
vl_api_tap_create_v2_t_handler (vl_api_tap_create_v2_t * mp)
{
static void
vl_api_tap_create_v2_t_handler (vl_api_tap_create_v2_t * mp)
{
+ vnet_main_t *vnm = vnet_get_main ();
vlib_main_t *vm = vlib_get_main ();
vl_api_tap_create_v2_reply_t *rmp;
vl_api_registration_t *reg;
tap_create_if_args_t _a, *ap = &_a;
vlib_main_t *vm = vlib_get_main ();
vl_api_tap_create_v2_reply_t *rmp;
vl_api_registration_t *reg;
tap_create_if_args_t _a, *ap = &_a;
- memset (ap, 0, sizeof (*ap));
+
clib_
memset (ap, 0, sizeof (*ap));
- ap->id =
mp->id
;
+ ap->id =
ntohl (mp->id)
;
if (!mp->use_random_mac)
{
clib_memcpy (ap->mac_addr, mp->mac_address, 6);
if (!mp->use_random_mac)
{
clib_memcpy (ap->mac_addr, mp->mac_address, 6);
@@
-96,12
+97,34
@@
vl_api_tap_create_v2_t_handler (vl_api_tap_create_v2_t * mp)
ap->host_ip6_prefix_len = mp->host_ip6_prefix_len;
}
ap->host_ip6_prefix_len = mp->host_ip6_prefix_len;
}
+ if (mp->host_ip4_gw_set)
+ {
+ clib_memcpy (&ap->host_ip4_gw, mp->host_ip4_gw, 4);
+ ap->host_ip4_gw_set = 1;
+ }
+
+ if (mp->host_ip6_gw_set)
+ {
+ clib_memcpy (&ap->host_ip6_gw, mp->host_ip6_gw, 16);
+ ap->host_ip6_gw_set = 1;
+ }
+
tap_create_if (vm, ap);
reg = vl_api_client_index_to_registration (mp->client_index);
if (!reg)
return;;
tap_create_if (vm, ap);
reg = vl_api_client_index_to_registration (mp->client_index);
if (!reg)
return;;
+ /* If a tag was supplied... */
+ if (mp->tag[0])
+ {
+ /* Make sure it's a proper C-string */
+ mp->tag[ARRAY_LEN (mp->tag) - 1] = 0;
+ u8 *tag = format (0, "%s%c", mp->tag, 0);
+ vnet_set_sw_interface_tag (vnm, tag, ap->sw_if_index);
+ }
+
+
rmp = vl_msg_api_alloc (sizeof (*rmp));
rmp->_vl_msg_id = ntohs (VL_API_TAP_CREATE_V2_REPLY);
rmp->context = mp->context;
rmp = vl_msg_api_alloc (sizeof (*rmp));
rmp->_vl_msg_id = ntohs (VL_API_TAP_CREATE_V2_REPLY);
rmp->context = mp->context;
@@
-119,7
+142,7
@@
tap_send_sw_interface_event_deleted (vpe_api_main_t * am,
vl_api_sw_interface_event_t *mp;
mp = vl_msg_api_alloc (sizeof (*mp));
vl_api_sw_interface_event_t *mp;
mp = vl_msg_api_alloc (sizeof (*mp));
- memset (mp, 0, sizeof (*mp));
+
clib_
memset (mp, 0, sizeof (*mp));
mp->_vl_msg_id = ntohs (VL_API_SW_INTERFACE_EVENT);
mp->sw_if_index = ntohl (sw_if_index);
mp->_vl_msg_id = ntohs (VL_API_SW_INTERFACE_EVENT);
mp->sw_if_index = ntohl (sw_if_index);
@@
-132,6
+155,7
@@
tap_send_sw_interface_event_deleted (vpe_api_main_t * am,
static void
vl_api_tap_delete_v2_t_handler (vl_api_tap_delete_v2_t * mp)
{
static void
vl_api_tap_delete_v2_t_handler (vl_api_tap_delete_v2_t * mp)
{
+ vnet_main_t *vnm = vnet_get_main ();
vlib_main_t *vm = vlib_get_main ();
int rv;
vpe_api_main_t *vam = &vpe_api_main;
vlib_main_t *vm = vlib_get_main ();
int rv;
vpe_api_main_t *vam = &vpe_api_main;
@@
-153,7
+177,10
@@
vl_api_tap_delete_v2_t_handler (vl_api_tap_delete_v2_t * mp)
vl_api_send_msg (reg, (u8 *) rmp);
if (!rv)
vl_api_send_msg (reg, (u8 *) rmp);
if (!rv)
- tap_send_sw_interface_event_deleted (vam, reg, sw_if_index);
+ {
+ vnet_clear_sw_interface_tag (vnm, sw_if_index);
+ tap_send_sw_interface_event_deleted (vam, reg, sw_if_index);
+ }
}
static void
}
static void
@@
-163,7
+190,7
@@
tap_send_sw_interface_details (vpe_api_main_t * am,
{
vl_api_sw_interface_tap_v2_details_t *mp;
mp = vl_msg_api_alloc (sizeof (*mp));
{
vl_api_sw_interface_tap_v2_details_t *mp;
mp = vl_msg_api_alloc (sizeof (*mp));
- memset (mp, 0, sizeof (*mp));
+
clib_
memset (mp, 0, sizeof (*mp));
mp->_vl_msg_id = htons (VL_API_SW_INTERFACE_TAP_V2_DETAILS);
mp->id = htonl (tap_if->id);
mp->sw_if_index = htonl (tap_if->sw_if_index);
mp->_vl_msg_id = htons (VL_API_SW_INTERFACE_TAP_V2_DETAILS);
mp->id = htonl (tap_if->id);
mp->sw_if_index = htonl (tap_if->sw_if_index);