X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Finterface_api.c;h=1d167c680fea0d5c293ceb209a08bbb01be065fb;hb=1855b8e4;hp=09f9b3fc1780959b21652f860e756d88d8c7e83b;hpb=b8d4481a93f919291d4b682ef0ac8948a9f1be32;p=vpp.git diff --git a/src/vnet/interface_api.c b/src/vnet/interface_api.c index 09f9b3fc178..1d167c680fe 100644 --- a/src/vnet/interface_api.c +++ b/src/vnet/interface_api.c @@ -50,6 +50,7 @@ vpe_api_main_t vpe_api_main; #define foreach_vpe_api_msg \ _(SW_INTERFACE_SET_FLAGS, sw_interface_set_flags) \ +_(HW_INTERFACE_SET_MTU, hw_interface_set_mtu) \ _(SW_INTERFACE_SET_MTU, sw_interface_set_mtu) \ _(WANT_INTERFACE_EVENTS, want_interface_events) \ _(SW_INTERFACE_DUMP, sw_interface_dump) \ @@ -61,13 +62,17 @@ _(SW_INTERFACE_SET_UNNUMBERED, sw_interface_set_unnumbered) \ _(SW_INTERFACE_CLEAR_STATS, sw_interface_clear_stats) \ _(SW_INTERFACE_TAG_ADD_DEL, sw_interface_tag_add_del) \ _(SW_INTERFACE_SET_MAC_ADDRESS, sw_interface_set_mac_address) \ +_(SW_INTERFACE_GET_MAC_ADDRESS, sw_interface_get_mac_address) \ _(CREATE_VLAN_SUBIF, create_vlan_subif) \ _(CREATE_SUBIF, create_subif) \ _(DELETE_SUBIF, delete_subif) \ _(CREATE_LOOPBACK, create_loopback) \ _(CREATE_LOOPBACK_INSTANCE, create_loopback_instance) \ _(DELETE_LOOPBACK, delete_loopback) \ -_(INTERFACE_NAME_RENUMBER, interface_name_renumber) +_(INTERFACE_NAME_RENUMBER, interface_name_renumber) \ +_(COLLECT_DETAILED_INTERFACE_STATS, collect_detailed_interface_stats) \ +_(SW_INTERFACE_SET_IP_DIRECTED_BROADCAST, \ + sw_interface_set_ip_directed_broadcast) static void vl_api_sw_interface_set_flags_t_handler (vl_api_sw_interface_set_flags_t * mp) @@ -94,11 +99,10 @@ vl_api_sw_interface_set_flags_t_handler (vl_api_sw_interface_set_flags_t * mp) } static void -vl_api_sw_interface_set_mtu_t_handler (vl_api_sw_interface_set_mtu_t * mp) +vl_api_hw_interface_set_mtu_t_handler (vl_api_hw_interface_set_mtu_t * mp) { - vl_api_sw_interface_set_mtu_reply_t *rmp; + vl_api_hw_interface_set_mtu_reply_t *rmp; vnet_main_t *vnm = vnet_get_main (); - u32 flags = ETHERNET_INTERFACE_FLAG_MTU; u32 sw_if_index = ntohl (mp->sw_if_index); u16 mtu = ntohs (mp->mtu); ethernet_main_t *em = ðernet_main; @@ -134,16 +138,50 @@ vl_api_sw_interface_set_mtu_t_handler (vl_api_sw_interface_set_mtu_t * mp) goto bad_sw_if_index; } - if (hi->max_packet_bytes != mtu) - { - hi->max_packet_bytes = mtu; - ethernet_set_flags (vnm, si->hw_if_index, flags); - } + vnet_hw_interface_set_mtu (vnm, si->hw_if_index, mtu); + + BAD_SW_IF_INDEX_LABEL; + REPLY_MACRO (VL_API_HW_INTERFACE_SET_MTU_REPLY); +} + +static void +vl_api_sw_interface_set_mtu_t_handler (vl_api_sw_interface_set_mtu_t * mp) +{ + vl_api_sw_interface_set_mtu_reply_t *rmp; + vnet_main_t *vnm = vnet_get_main (); + u32 sw_if_index = ntohl (mp->sw_if_index); + int rv = 0; + int i; + u32 per_protocol_mtu[VNET_N_MTU]; + + VALIDATE_SW_IF_INDEX (mp); + + for (i = 0; i < VNET_N_MTU; i++) + per_protocol_mtu[i] = ntohl (mp->mtu[i]); + + vnet_sw_interface_set_protocol_mtu (vnm, sw_if_index, per_protocol_mtu); BAD_SW_IF_INDEX_LABEL; REPLY_MACRO (VL_API_SW_INTERFACE_SET_MTU_REPLY); } +static void + vl_api_sw_interface_set_ip_directed_broadcast_t_handler + (vl_api_sw_interface_set_ip_directed_broadcast_t * mp) +{ + vl_api_sw_interface_set_ip_directed_broadcast_reply_t *rmp; + u32 sw_if_index = ntohl (mp->sw_if_index); + int rv = 0; + + VALIDATE_SW_IF_INDEX (mp); + + vnet_sw_interface_ip_directed_broadcast (vnet_get_main (), + sw_if_index, mp->enable); + + BAD_SW_IF_INDEX_LABEL; + REPLY_MACRO (VL_API_SW_INTERFACE_SET_IP_DIRECTED_BROADCAST_REPLY); +} + static void send_sw_interface_details (vpe_api_main_t * am, vl_api_registration_t * rp, @@ -165,6 +203,11 @@ send_sw_interface_details (vpe_api_main_t * am, mp->link_speed = ((hi->flags & VNET_HW_INTERFACE_FLAG_SPEED_MASK) >> VNET_HW_INTERFACE_FLAG_SPEED_SHIFT); mp->link_mtu = ntohs (hi->max_packet_bytes); + mp->mtu[VNET_MTU_L3] = ntohl (swif->mtu[VNET_MTU_L3]); + mp->mtu[VNET_MTU_IP4] = ntohl (swif->mtu[VNET_MTU_IP4]); + mp->mtu[VNET_MTU_IP6] = ntohl (swif->mtu[VNET_MTU_IP6]); + mp->mtu[VNET_MTU_MPLS] = ntohl (swif->mtu[VNET_MTU_MPLS]); + mp->context = context; strncpy ((char *) mp->interface_name, @@ -241,7 +284,7 @@ send_sw_interface_details (vpe_api_main_t * am, if (tag) strncpy ((char *) mp->tag, (char *) tag, ARRAY_LEN (mp->tag) - 1); - vl_msg_api_send (rp, (u8 *) mp); + vl_api_send_msg (rp, (u8 *) mp); } static void @@ -384,31 +427,16 @@ ip_table_bind (fib_protocol_t fproto, msrc = MFIB_SOURCE_CLI; } - /* - * This is temporary whilst I do the song and dance with the CSIT version - */ - if (0 != table_id) - { - fib_index = fib_table_find_or_create_and_lock (fproto, table_id, src); - mfib_index = - mfib_table_find_or_create_and_lock (fproto, table_id, msrc); - } - else - { - fib_index = 0; - mfib_index = 0; - } - /* * This if table does not exist = error is what we want in the end. */ - /* fib_index = fib_table_find (fproto, table_id); */ - /* mfib_index = mfib_table_find (fproto, table_id); */ + fib_index = fib_table_find (fproto, table_id); + mfib_index = mfib_table_find (fproto, table_id); - /* if (~0 == fib_index || ~0 == mfib_index) */ - /* { */ - /* return (VNET_API_ERROR_NO_SUCH_FIB); */ - /* } */ + if (~0 == fib_index || ~0 == mfib_index) + { + return (VNET_API_ERROR_NO_SUCH_FIB); + } if (FIB_PROTOCOL_IP6 == fproto) { @@ -516,20 +544,11 @@ ip_table_bind (fib_protocol_t fproto, ip4_main.mfib_index_by_sw_if_index[sw_if_index] = mfib_index; } - /* - * Temporary. undo the locks from the find and create at the staart - */ - if (0 != table_id) - { - fib_table_unlock (fib_index, fproto, src); - mfib_table_unlock (mfib_index, fproto, msrc); - } - return (0); } static void -send_sw_interface_get_table_reply (unix_shared_memory_queue_t * q, +send_sw_interface_get_table_reply (vl_api_registration_t * reg, u32 context, int retval, u32 vrf_id) { vl_api_sw_interface_get_table_reply_t *mp; @@ -541,13 +560,13 @@ send_sw_interface_get_table_reply (unix_shared_memory_queue_t * q, mp->retval = htonl (retval); mp->vrf_id = htonl (vrf_id); - vl_msg_api_send_shmem (q, (u8 *) & mp); + vl_api_send_msg (reg, (u8 *) mp); } static void vl_api_sw_interface_get_table_t_handler (vl_api_sw_interface_get_table_t * mp) { - unix_shared_memory_queue_t *q; + vl_api_registration_t *reg; fib_table_t *fib_table = 0; u32 sw_if_index = ~0; u32 fib_index = ~0; @@ -555,8 +574,8 @@ vl_api_sw_interface_get_table_t_handler (vl_api_sw_interface_get_table_t * mp) fib_protocol_t fib_proto = FIB_PROTOCOL_IP4; int rv = 0; - 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; VALIDATE_SW_IF_INDEX (mp); @@ -575,7 +594,7 @@ vl_api_sw_interface_get_table_t_handler (vl_api_sw_interface_get_table_t * mp) BAD_SW_IF_INDEX_LABEL; - send_sw_interface_get_table_reply (q, mp->context, rv, table_id); + send_sw_interface_get_table_reply (reg, mp->context, rv, table_id); } static void vl_api_sw_interface_set_unnumbered_t_handler @@ -586,7 +605,6 @@ static void vl_api_sw_interface_set_unnumbered_t_handler vnet_main_t *vnm = vnet_get_main (); u32 sw_if_index = ntohl (mp->sw_if_index); u32 unnumbered_sw_if_index = ntohl (mp->unnumbered_sw_if_index); - u32 was_unnum; /* * The API message field names are backwards from @@ -606,42 +624,8 @@ static void vl_api_sw_interface_set_unnumbered_t_handler goto done; } - vnet_sw_interface_t *si = - vnet_get_sw_interface (vnm, unnumbered_sw_if_index); - was_unnum = (si->flags & VNET_SW_INTERFACE_FLAG_UNNUMBERED); - - if (mp->is_add) - { - si->flags |= VNET_SW_INTERFACE_FLAG_UNNUMBERED; - si->unnumbered_sw_if_index = sw_if_index; - - ip4_main.lookup_main.if_address_pool_index_by_sw_if_index - [unnumbered_sw_if_index] = - ip4_main. - lookup_main.if_address_pool_index_by_sw_if_index[sw_if_index]; - ip6_main. - lookup_main.if_address_pool_index_by_sw_if_index - [unnumbered_sw_if_index] = - ip6_main. - lookup_main.if_address_pool_index_by_sw_if_index[sw_if_index]; - } - else - { - si->flags &= ~(VNET_SW_INTERFACE_FLAG_UNNUMBERED); - si->unnumbered_sw_if_index = (u32) ~ 0; - - ip4_main.lookup_main.if_address_pool_index_by_sw_if_index - [unnumbered_sw_if_index] = ~0; - ip6_main.lookup_main.if_address_pool_index_by_sw_if_index - [unnumbered_sw_if_index] = ~0; - } - - if (was_unnum != (si->flags & VNET_SW_INTERFACE_FLAG_UNNUMBERED)) - { - ip4_sw_interface_enable_disable (unnumbered_sw_if_index, mp->is_add); - ip6_sw_interface_enable_disable (unnumbered_sw_if_index, mp->is_add); - } - + vnet_sw_interface_update_unnumbered (unnumbered_sw_if_index, + sw_if_index, mp->is_add); done: REPLY_MACRO (VL_API_SW_INTERFACE_SET_UNNUMBERED_REPLY); } @@ -724,7 +708,7 @@ event_data_cmp (void *a1, void *a2) static void send_sw_interface_event (vpe_api_main_t * am, vpe_client_registration_t * reg, - unix_shared_memory_queue_t * q, + vl_api_registration_t * vl_reg, vnet_sw_interface_t * swif) { vl_api_sw_interface_event_t *mp; @@ -741,7 +725,7 @@ send_sw_interface_event (vpe_api_main_t * am, mp->admin_up_down = (swif->flags & VNET_SW_INTERFACE_FLAG_ADMIN_UP) ? 1 : 0; mp->link_up_down = (hi->flags & VNET_HW_INTERFACE_FLAG_LINK_UP) ? 1 : 0; - vl_msg_api_send_shmem (q, (u8 *) & mp); + vl_api_send_msg (vl_reg, (u8 *) mp); } static uword @@ -755,7 +739,7 @@ link_state_process (vlib_main_t * vm, vpe_client_registration_t *reg; int i; u32 prev_sw_if_index; - unix_shared_memory_queue_t *q; + vl_api_registration_t *vl_reg; vam->link_state_process_up = 1; @@ -784,15 +768,15 @@ link_state_process (vlib_main_t * vm, /* *INDENT-OFF* */ pool_foreach(reg, vam->interface_events_registrations, ({ - q = vl_api_client_index_to_input_queue (reg->client_index); - if (q) + vl_reg = vl_api_client_index_to_registration (reg->client_index); + if (vl_reg) { /* sw_interface may be deleted already */ if (!pool_is_free_index (vnm->interface_main.sw_interfaces, event_data[i])) { swif = vnet_get_sw_interface (vnm, event_data[i]); - send_sw_interface_event (vam, reg, q, swif); + send_sw_interface_event (vam, reg, vl_reg, swif); } } })); @@ -908,6 +892,37 @@ out: REPLY_MACRO (VL_API_SW_INTERFACE_SET_MAC_ADDRESS_REPLY); } +static void vl_api_sw_interface_get_mac_address_t_handler + (vl_api_sw_interface_get_mac_address_t * mp) +{ + vl_api_sw_interface_get_mac_address_reply_t *rmp; + vl_api_registration_t *reg; + vnet_main_t *vnm = vnet_get_main (); + u32 sw_if_index = ntohl (mp->sw_if_index); + vnet_sw_interface_t *si; + ethernet_interface_t *eth_if = 0; + int rv = 0; + + VALIDATE_SW_IF_INDEX (mp); + + si = vnet_get_sup_sw_interface (vnm, sw_if_index); + if (si->type == VNET_SW_INTERFACE_TYPE_HARDWARE) + eth_if = ethernet_get_interface (ðernet_main, si->hw_if_index); + + BAD_SW_IF_INDEX_LABEL; + + reg = vl_api_client_index_to_registration (mp->client_index); + if (!reg) + return; + rmp = vl_msg_api_alloc (sizeof (*rmp)); + rmp->_vl_msg_id = htons (VL_API_SW_INTERFACE_GET_MAC_ADDRESS_REPLY); + rmp->context = mp->context; + rmp->retval = htonl (rv); + if (!rv && eth_if) + memcpy (rmp->mac_address, eth_if->address, 6); + vl_api_send_msg (reg, (u8 *) rmp); +} + static void vl_api_sw_interface_set_rx_mode_t_handler (vl_api_sw_interface_set_rx_mode_t * mp) { @@ -949,7 +964,7 @@ vl_api_create_vlan_subif_t_handler (vl_api_create_vlan_subif_t * mp) uword *p; vnet_interface_main_t *im = &vnm->interface_main; u64 sup_and_sub_key; - unix_shared_memory_queue_t *q; + vl_api_registration_t *reg; clib_error_t *error; VALIDATE_SW_IF_INDEX (mp); @@ -1004,8 +1019,8 @@ vl_api_create_vlan_subif_t_handler (vl_api_create_vlan_subif_t * mp) BAD_SW_IF_INDEX_LABEL; out: - 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)); @@ -1013,7 +1028,7 @@ out: rmp->context = mp->context; rmp->retval = htonl (rv); rmp->sw_if_index = htonl (sw_if_index); - vl_msg_api_send_shmem (q, (u8 *) & rmp); + vl_api_send_msg (reg, (u8 *) rmp); } static void @@ -1177,6 +1192,20 @@ vl_api_delete_loopback_t_handler (vl_api_delete_loopback_t * mp) REPLY_MACRO (VL_API_DELETE_LOOPBACK_REPLY); } +static void + vl_api_collect_detailed_interface_stats_t_handler + (vl_api_collect_detailed_interface_stats_t * mp) +{ + vl_api_collect_detailed_interface_stats_reply_t *rmp; + int rv = 0; + + rv = + vnet_sw_interface_stats_collect_enable_disable (ntohl (mp->sw_if_index), + mp->enable_disable); + + REPLY_MACRO (VL_API_COLLECT_DETAILED_INTERFACE_STATS_REPLY); +} + /* * vpe_api_hookup * Add vpe's API message handlers to the table.