Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
tapv2: CLI and binary API fixes
[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
841d21e
..
c6da0c9
100644
(file)
--- a/
src/vnet/devices/tap/tapv2_api.c
+++ b/
src/vnet/devices/tap/tapv2_api.c
@@
-54,12
+54,12
@@
vl_api_tap_create_v2_t_handler (vl_api_tap_create_v2_t * mp)
{
vlib_main_t *vm = vlib_get_main ();
vl_api_tap_create_v2_reply_t *rmp;
{
vlib_main_t *vm = vlib_get_main ();
vl_api_tap_create_v2_reply_t *rmp;
-
unix_shared_memory_queue_t *q
;
+
vl_api_registration_t *reg
;
tap_create_if_args_t _a, *ap = &_a;
memset (ap, 0, sizeof (*ap));
tap_create_if_args_t _a, *ap = &_a;
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,11
+96,23
@@
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);
tap_create_if (vm, ap);
-
q = vl_api_client_index_to_input_queue
(mp->client_index);
- if (!
q
)
- return;
+
reg = vl_api_client_index_to_registration
(mp->client_index);
+ if (!
reg
)
+ return;
;
rmp = vl_msg_api_alloc (sizeof (*rmp));
rmp->_vl_msg_id = ntohs (VL_API_TAP_CREATE_V2_REPLY);
rmp = vl_msg_api_alloc (sizeof (*rmp));
rmp->_vl_msg_id = ntohs (VL_API_TAP_CREATE_V2_REPLY);
@@
-108,12
+120,12
@@
vl_api_tap_create_v2_t_handler (vl_api_tap_create_v2_t * mp)
rmp->retval = ntohl (ap->rv);
rmp->sw_if_index = ntohl (ap->sw_if_index);
rmp->retval = ntohl (ap->rv);
rmp->sw_if_index = ntohl (ap->sw_if_index);
- vl_
msg_api_send_shmem (q, (u8 *) &
rmp);
+ vl_
api_send_msg (reg, (u8 *)
rmp);
}
static void
tap_send_sw_interface_event_deleted (vpe_api_main_t * am,
}
static void
tap_send_sw_interface_event_deleted (vpe_api_main_t * am,
-
unix_shared_memory_queue_t * q
,
+
vl_api_registration_t * reg
,
u32 sw_if_index)
{
vl_api_sw_interface_event_t *mp;
u32 sw_if_index)
{
vl_api_sw_interface_event_t *mp;
@@
-126,7
+138,7
@@
tap_send_sw_interface_event_deleted (vpe_api_main_t * am,
mp->admin_up_down = 0;
mp->link_up_down = 0;
mp->deleted = 1;
mp->admin_up_down = 0;
mp->link_up_down = 0;
mp->deleted = 1;
- vl_
msg_api_send_shmem (q, (u8 *) &
mp);
+ vl_
api_send_msg (reg, (u8 *)
mp);
}
static void
}
static void
@@
-136,13
+148,13
@@
vl_api_tap_delete_v2_t_handler (vl_api_tap_delete_v2_t * mp)
int rv;
vpe_api_main_t *vam = &vpe_api_main;
vl_api_tap_delete_v2_reply_t *rmp;
int rv;
vpe_api_main_t *vam = &vpe_api_main;
vl_api_tap_delete_v2_reply_t *rmp;
-
unix_shared_memory_queue_t *q
;
+
vl_api_registration_t *reg
;
u32 sw_if_index = ntohl (mp->sw_if_index);
rv = tap_delete_if (vm, sw_if_index);
u32 sw_if_index = ntohl (mp->sw_if_index);
rv = tap_delete_if (vm, sw_if_index);
-
q = vl_api_client_index_to_input_queue
(mp->client_index);
- if (!
q
)
+
reg = vl_api_client_index_to_registration
(mp->client_index);
+ if (!
reg
)
return;
rmp = vl_msg_api_alloc (sizeof (*rmp));
return;
rmp = vl_msg_api_alloc (sizeof (*rmp));
@@
-150,15
+162,15
@@
vl_api_tap_delete_v2_t_handler (vl_api_tap_delete_v2_t * mp)
rmp->context = mp->context;
rmp->retval = ntohl (rv);
rmp->context = mp->context;
rmp->retval = ntohl (rv);
- vl_
msg_api_send_shmem (q, (u8 *) &
rmp);
+ vl_
api_send_msg (reg, (u8 *)
rmp);
if (!rv)
if (!rv)
- tap_send_sw_interface_event_deleted (vam,
q
, sw_if_index);
+ tap_send_sw_interface_event_deleted (vam,
reg
, sw_if_index);
}
static void
tap_send_sw_interface_details (vpe_api_main_t * am,
}
static void
tap_send_sw_interface_details (vpe_api_main_t * am,
-
unix_shared_memory_queue_t * q
,
+
vl_api_registration_t * reg
,
tap_interface_details_t * tap_if, u32 context)
{
vl_api_sw_interface_tap_v2_details_t *mp;
tap_interface_details_t * tap_if, u32 context)
{
vl_api_sw_interface_tap_v2_details_t *mp;
@@
-190,7
+202,7
@@
tap_send_sw_interface_details (vpe_api_main_t * am,
mp->host_ip6_prefix_len = tap_if->host_ip6_prefix_len;
mp->context = context;
mp->host_ip6_prefix_len = tap_if->host_ip6_prefix_len;
mp->context = context;
- vl_
msg_api_send_shmem (q, (u8 *) &
mp);
+ vl_
api_send_msg (reg, (u8 *)
mp);
}
static void
}
static void
@@
-199,12
+211,12
@@
vl_api_sw_interface_tap_v2_dump_t_handler (vl_api_sw_interface_tap_v2_dump_t *
{
int rv;
vpe_api_main_t *am = &vpe_api_main;
{
int rv;
vpe_api_main_t *am = &vpe_api_main;
-
unix_shared_memory_queue_t *q
;
+
vl_api_registration_t *reg
;
tap_interface_details_t *tapifs = NULL;
tap_interface_details_t *tap_if = NULL;
tap_interface_details_t *tapifs = NULL;
tap_interface_details_t *tap_if = NULL;
-
q = vl_api_client_index_to_input_queue
(mp->client_index);
- if (
q == 0
)
+
reg = vl_api_client_index_to_registration
(mp->client_index);
+ if (
!reg
)
return;
rv = tap_dump_ifs (&tapifs);
return;
rv = tap_dump_ifs (&tapifs);
@@
-213,7
+225,7
@@
vl_api_sw_interface_tap_v2_dump_t_handler (vl_api_sw_interface_tap_v2_dump_t *
vec_foreach (tap_if, tapifs)
{
vec_foreach (tap_if, tapifs)
{
- tap_send_sw_interface_details (am,
q
, tap_if, mp->context);
+ tap_send_sw_interface_details (am,
reg
, tap_if, mp->context);
}
vec_free (tapifs);
}
vec_free (tapifs);