X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fdevices%2Ftap%2Ftapv2_api.c;h=34472c0ab28bc15f28849b22d5640cfcc322019b;hb=7866c4595b65f54f491ffc4e92b1f8cf94d6f142;hp=2b324d6b545b8c101429fbf0bd87065939ef574b;hpb=2aef64f04ed9a43cd0a2a9a1616069a24c14eef8;p=vpp.git diff --git a/src/vnet/devices/tap/tapv2_api.c b/src/vnet/devices/tap/tapv2_api.c index 2b324d6b545..34472c0ab28 100644 --- a/src/vnet/devices/tap/tapv2_api.c +++ b/src/vnet/devices/tap/tapv2_api.c @@ -54,21 +54,30 @@ 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; - unix_shared_memory_queue_t *q; + vl_api_registration_t *reg; tap_create_if_args_t _a, *ap = &_a; memset (ap, 0, sizeof (*ap)); - ap->name = mp->tap_name; + ap->id = mp->id; if (!mp->use_random_mac) { - clib_memcpy (ap->hw_addr, mp->mac_address, 6); - ap->hw_addr_set = 1; + clib_memcpy (ap->mac_addr, mp->mac_address, 6); + ap->mac_addr_set = 1; } ap->rx_ring_sz = ntohs (mp->rx_ring_sz); ap->tx_ring_sz = ntohs (mp->tx_ring_sz); ap->sw_if_index = (u32) ~ 0; + if (mp->host_if_name_set) + ap->host_if_name = mp->host_if_name; + + if (mp->host_mac_addr_set) + { + clib_memcpy (ap->host_mac_addr, mp->host_mac_addr, 6); + ap->mac_addr_set = 1; + } + if (mp->host_namespace_set) ap->host_namespace = mp->host_namespace; @@ -87,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; } + 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); - 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); @@ -99,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); - 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, - unix_shared_memory_queue_t * q, + vl_api_registration_t * reg, u32 sw_if_index) { vl_api_sw_interface_event_t *mp; @@ -117,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; - vl_msg_api_send_shmem (q, (u8 *) & mp); + vl_api_send_msg (reg, (u8 *) mp); } static void @@ -127,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; - 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); - 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)); @@ -141,28 +162,47 @@ vl_api_tap_delete_v2_t_handler (vl_api_tap_delete_v2_t * mp) 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) - 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, - 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; mp = vl_msg_api_alloc (sizeof (*mp)); memset (mp, 0, sizeof (*mp)); - mp->_vl_msg_id = ntohs (VL_API_SW_INTERFACE_TAP_V2_DETAILS); - mp->sw_if_index = ntohl (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); clib_memcpy (mp->dev_name, tap_if->dev_name, MIN (ARRAY_LEN (mp->dev_name) - 1, strlen ((const char *) tap_if->dev_name))); - mp->context = context; + mp->rx_ring_sz = htons (tap_if->rx_ring_sz); + mp->tx_ring_sz = htons (tap_if->tx_ring_sz); + clib_memcpy (mp->host_mac_addr, tap_if->host_mac_addr, 6); + clib_memcpy (mp->host_if_name, tap_if->host_if_name, + MIN (ARRAY_LEN (mp->host_if_name) - 1, + strlen ((const char *) tap_if->host_if_name))); + clib_memcpy (mp->host_namespace, tap_if->host_namespace, + MIN (ARRAY_LEN (mp->host_namespace) - 1, + strlen ((const char *) tap_if->host_namespace))); + clib_memcpy (mp->host_bridge, tap_if->host_bridge, + MIN (ARRAY_LEN (mp->host_bridge) - 1, + strlen ((const char *) tap_if->host_bridge))); + if (tap_if->host_ip4_prefix_len) + clib_memcpy (&mp->host_ip4_addr, &tap_if->host_ip4_addr, 4); + mp->host_ip4_prefix_len = tap_if->host_ip4_prefix_len; + if (tap_if->host_ip6_prefix_len) + clib_memcpy (&mp->host_ip6_addr, &tap_if->host_ip6_addr, 16); + mp->host_ip6_prefix_len = tap_if->host_ip6_prefix_len; - vl_msg_api_send_shmem (q, (u8 *) & mp); + mp->context = context; + vl_api_send_msg (reg, (u8 *) mp); } static void @@ -171,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; - unix_shared_memory_queue_t *q; + vl_api_registration_t *reg; 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); @@ -185,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) { - 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);