X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fip%2Fip_api.c;h=f58ca079b041bdbaae07fc25aac0861183216a37;hb=refs%2Fchanges%2F13%2F16713%2F3;hp=0d98ba5d597e6407f406011e6fbc1832a1d4d6ad;hpb=b7b929931a07fbb27b43d5cd105f366c3e29807e;p=vpp.git diff --git a/src/vnet/ip/ip_api.c b/src/vnet/ip/ip_api.c index 0d98ba5d597..f58ca079b04 100644 --- a/src/vnet/ip/ip_api.c +++ b/src/vnet/ip/ip_api.c @@ -26,6 +26,7 @@ #include #include #include +#include #include #include #include @@ -100,8 +101,6 @@ _(IP6ND_PROXY_ADD_DEL, ip6nd_proxy_add_del) \ _(IP6ND_PROXY_DUMP, ip6nd_proxy_dump) \ _(IP6ND_SEND_ROUTER_SOLICITATION, ip6nd_send_router_solicitation) \ _(SW_INTERFACE_IP6_ENABLE_DISABLE, sw_interface_ip6_enable_disable ) \ -_(SW_INTERFACE_IP6_SET_LINK_LOCAL_ADDRESS, \ - sw_interface_ip6_set_link_local_address) \ _(IP_CONTAINER_PROXY_ADD_DEL, ip_container_proxy_add_del) \ _(IP_CONTAINER_PROXY_DUMP, ip_container_proxy_dump) \ _(IOAM_ENABLE, ioam_enable) \ @@ -110,9 +109,13 @@ _(IP_SOURCE_AND_PORT_RANGE_CHECK_ADD_DEL, \ ip_source_and_port_range_check_add_del) \ _(IP_SOURCE_AND_PORT_RANGE_CHECK_INTERFACE_ADD_DEL, \ ip_source_and_port_range_check_interface_add_del) \ +_(IP_SOURCE_CHECK_INTERFACE_ADD_DEL, \ + ip_source_check_interface_add_del) \ _(IP_REASSEMBLY_SET, ip_reassembly_set) \ _(IP_REASSEMBLY_GET, ip_reassembly_get) \ -_(IP_REASSEMBLY_ENABLE_DISABLE, ip_reassembly_enable_disable) +_(IP_REASSEMBLY_ENABLE_DISABLE, ip_reassembly_enable_disable) \ +_(IP_PUNT_REDIRECT_DUMP, ip_punt_redirect_dump) + extern void stats_dslock_with_hint (int hint, int tag); extern void stats_dsunlock (void); @@ -405,13 +408,13 @@ send_ip_mfib_details (vl_api_registration_t * reg, { fib_route_path_encode_t *api_rpath, *api_rpaths = NULL; vl_api_ip_mfib_details_t *mp; + const mfib_prefix_t *pfx; mfib_entry_t *mfib_entry; - vl_api_fib_path_t *fp; - mfib_prefix_t pfx; + vl_api_mfib_path_t *fp; int path_count; mfib_entry = mfib_entry_get (mfei); - mfib_entry_get_prefix (mfei, &pfx); + pfx = mfib_entry_get_prefix (mfei); mfib_entry_encode (mfei, &api_rpaths); path_count = vec_len (api_rpaths); @@ -425,17 +428,18 @@ send_ip_mfib_details (vl_api_registration_t * reg, mp->rpf_id = mfib_entry->mfe_rpf_id; mp->entry_flags = mfib_entry->mfe_flags; mp->table_id = htonl (table_id); - mp->address_length = pfx.fp_len; - memcpy (mp->grp_address, &pfx.fp_grp_addr.ip4, - sizeof (pfx.fp_grp_addr.ip4)); - memcpy (mp->src_address, &pfx.fp_src_addr.ip4, - sizeof (pfx.fp_src_addr.ip4)); + mp->address_length = pfx->fp_len; + memcpy (mp->grp_address, &pfx->fp_grp_addr.ip4, + sizeof (pfx->fp_grp_addr.ip4)); + memcpy (mp->src_address, &pfx->fp_src_addr.ip4, + sizeof (pfx->fp_src_addr.ip4)); mp->count = htonl (path_count); fp = mp->path; vec_foreach (api_rpath, api_rpaths) { - fib_api_path_encode (api_rpath, fp); + fib_api_path_encode (api_rpath, &fp->path); + fp->itf_flags = ntohl (api_rpath->rpath.frp_mitf_flags); fp++; } vec_free (api_rpaths); @@ -500,12 +504,12 @@ static void send_ip6_mfib_details (vpe_api_main_t * am, vl_api_registration_t * reg, u32 table_id, - mfib_prefix_t * pfx, + const mfib_prefix_t * pfx, fib_route_path_encode_t * api_rpaths, u32 context) { vl_api_ip6_mfib_details_t *mp; fib_route_path_encode_t *api_rpath; - vl_api_fib_path_t *fp; + vl_api_mfib_path_t *fp; int path_count; path_count = vec_len (api_rpaths); @@ -527,7 +531,8 @@ send_ip6_mfib_details (vpe_api_main_t * am, fp = mp->path; vec_foreach (api_rpath, api_rpaths) { - fib_api_path_encode (api_rpath, fp); + fib_api_path_encode (api_rpath, &fp->path); + fp->itf_flags = ntohl (api_rpath->rpath.frp_mitf_flags); fp++; } @@ -556,8 +561,8 @@ vl_api_ip6_mfib_dump_t_handler (vl_api_ip6_mfib_dump_t * mp) vl_api_registration_t *reg; ip6_main_t *im = &ip6_main; mfib_table_t *mfib_table; + const mfib_prefix_t *pfx; fib_node_index_t *mfeip; - mfib_prefix_t pfx; fib_route_path_encode_t *api_rpaths = NULL; vl_api_ip6_mfib_dump_ctc_t ctx = { .entries = NULL, @@ -579,11 +584,11 @@ vl_api_ip6_mfib_dump_t_handler (vl_api_ip6_mfib_dump_t * mp) vec_foreach(mfeip, ctx.entries) { - mfib_entry_get_prefix (*mfeip, &pfx); + pfx = mfib_entry_get_prefix (*mfeip); mfib_entry_encode (*mfeip, &api_rpaths); send_ip6_mfib_details (am, reg, mfib_table->mft_table_id, - &pfx, api_rpaths, + pfx, api_rpaths, mp->context); } vec_reset_length (api_rpaths); @@ -617,40 +622,40 @@ vl_api_ip_punt_redirect_t_handler (vl_api_ip_punt_redirect_t * mp, { vl_api_ip_punt_redirect_reply_t *rmp; int rv = 0; + ip46_type_t ipv; + ip46_address_t nh; + if (!vnet_sw_if_index_is_api_valid (ntohl (mp->punt.tx_sw_if_index))) + goto bad_sw_if_index; + + ipv = ip_address_decode (&mp->punt.nh, &nh); if (mp->is_add) { - ip46_address_t nh; - - clib_memset (&nh, 0, sizeof (nh)); - - if (mp->is_ip6) + if (ipv == IP46_TYPE_IP6) { - memcpy (&nh.ip6, mp->nh, sizeof (nh.ip6)); - - ip6_punt_redirect_add (ntohl (mp->rx_sw_if_index), - ntohl (mp->tx_sw_if_index), &nh); + ip6_punt_redirect_add (ntohl (mp->punt.rx_sw_if_index), + ntohl (mp->punt.tx_sw_if_index), &nh); } - else + else if (ipv == IP46_TYPE_IP4) { - memcpy (&nh.ip4, mp->nh, sizeof (nh.ip4)); - - ip4_punt_redirect_add (ntohl (mp->rx_sw_if_index), - ntohl (mp->tx_sw_if_index), &nh); + ip4_punt_redirect_add (ntohl (mp->punt.rx_sw_if_index), + ntohl (mp->punt.tx_sw_if_index), &nh); } } else { - if (mp->is_ip6) + if (ipv == IP46_TYPE_IP6) { - ip6_punt_redirect_del (ntohl (mp->rx_sw_if_index)); + ip6_punt_redirect_del (ntohl (mp->punt.rx_sw_if_index)); } - else + else if (ipv == IP46_TYPE_IP4) { - ip4_punt_redirect_del (ntohl (mp->rx_sw_if_index)); + ip4_punt_redirect_del (ntohl (mp->punt.rx_sw_if_index)); } } + BAD_SW_IF_INDEX_LABEL; + REPLY_MACRO (VL_API_IP_PUNT_REDIRECT_REPLY); } @@ -807,6 +812,8 @@ add_del_route_t_handler (u8 is_multipath, path.frp_local_label = next_hop_via_label; path.frp_eos = MPLS_NON_EOS; } + if (is_local) + path_flags |= FIB_ROUTE_PATH_LOCAL; if (is_dvr) path_flags |= FIB_ROUTE_PATH_DVR; if (is_resolve_host) @@ -1825,44 +1832,12 @@ static void REPLY_MACRO (VL_API_SW_INTERFACE_IP6_ENABLE_DISABLE_REPLY); } -static void - vl_api_sw_interface_ip6_set_link_local_address_t_handler - (vl_api_sw_interface_ip6_set_link_local_address_t * mp) -{ - vlib_main_t *vm = vlib_get_main (); - vl_api_sw_interface_ip6_set_link_local_address_reply_t *rmp; - int rv = 0; - clib_error_t *error; - vnet_main_t *vnm = vnet_get_main (); - - vnm->api_errno = 0; - - VALIDATE_SW_IF_INDEX (mp); - - error = set_ip6_link_local_address (vm, - ntohl (mp->sw_if_index), - (ip6_address_t *) mp->address); - if (error) - { - clib_error_report (error); - rv = VNET_API_ERROR_UNSPECIFIED; - } - else - { - rv = vnm->api_errno; - } - - BAD_SW_IF_INDEX_LABEL; - - REPLY_MACRO (VL_API_SW_INTERFACE_IP6_SET_LINK_LOCAL_ADDRESS_REPLY); -} - void vl_mfib_signal_send_one (vl_api_registration_t * reg, u32 context, const mfib_signal_t * mfs) { vl_api_mfib_signal_details_t *mp; - mfib_prefix_t prefix; + const mfib_prefix_t *prefix; mfib_table_t *mfib; mfib_itf_t *mfi; @@ -1873,25 +1848,25 @@ vl_mfib_signal_send_one (vl_api_registration_t * reg, mp->context = context; mfi = mfib_itf_get (mfs->mfs_itf); - mfib_entry_get_prefix (mfs->mfs_entry, &prefix); + prefix = mfib_entry_get_prefix (mfs->mfs_entry); mfib = mfib_table_get (mfib_entry_get_fib_index (mfs->mfs_entry), - prefix.fp_proto); + prefix->fp_proto); mp->table_id = ntohl (mfib->mft_table_id); mp->sw_if_index = ntohl (mfi->mfi_sw_if_index); - if (FIB_PROTOCOL_IP4 == prefix.fp_proto) + if (FIB_PROTOCOL_IP4 == prefix->fp_proto) { - mp->grp_address_len = ntohs (prefix.fp_len); + mp->grp_address_len = ntohs (prefix->fp_len); - memcpy (mp->grp_address, &prefix.fp_grp_addr.ip4, 4); - if (prefix.fp_len > 32) + memcpy (mp->grp_address, &prefix->fp_grp_addr.ip4, 4); + if (prefix->fp_len > 32) { - memcpy (mp->src_address, &prefix.fp_src_addr.ip4, 4); + memcpy (mp->src_address, &prefix->fp_src_addr.ip4, 4); } } else { - mp->grp_address_len = ntohs (prefix.fp_len); + mp->grp_address_len = ntohs (prefix->fp_len); ASSERT (0); } @@ -2171,6 +2146,36 @@ reply: REPLY_MACRO (VL_API_IP_SOURCE_AND_PORT_RANGE_CHECK_INTERFACE_ADD_DEL_REPLY); } +typedef union +{ + u32 fib_index; +} ip4_source_check_config_t; + +static void + vl_api_ip_source_check_interface_add_del_t_handler + (vl_api_ip_source_check_interface_add_del_t * mp) +{ + vl_api_ip_source_check_interface_add_del_reply_t *rmp; + int rv; + u32 sw_if_index = ntohl (mp->sw_if_index); + u8 is_add = mp->is_add; + char *feature_name = + mp->loose ? "ip4-source-check-via-any" : "ip4-source-check-via-rx"; + + ip4_source_check_config_t config; + + VALIDATE_SW_IF_INDEX (mp); + + config.fib_index = + fib_table_get_index_for_sw_if_index (FIB_PROTOCOL_IP4, sw_if_index); + rv = + vnet_feature_enable_disable ("ip4-unicast", feature_name, sw_if_index, + is_add, &config, sizeof (config)); + BAD_SW_IF_INDEX_LABEL; + + REPLY_MACRO (VL_API_IP_SOURCE_CHECK_INTERFACE_ADD_DEL_REPLY); +} + #define IP4_ARP_EVENT 3 #define IP6_ND_EVENT 4 @@ -3340,7 +3345,77 @@ void mp->enable_ip6); } - REPLY_MACRO (VL_API_IP_REASSEMBLY_SET_REPLY); + REPLY_MACRO (VL_API_IP_REASSEMBLY_ENABLE_DISABLE_REPLY); +} + +void +send_ip_punt_redirect_details (vl_api_registration_t * reg, + u32 context, u32 sw_if_index, + ip_punt_redirect_rx_t * pr, u8 is_ipv6) +{ + vl_api_ip_punt_redirect_details_t *mp; + + mp = vl_msg_api_alloc (sizeof (*mp)); + if (!mp) + return; + + clib_memset (mp, 0, sizeof (*mp)); + mp->_vl_msg_id = ntohs (VL_API_IP_PUNT_REDIRECT_DETAILS); + mp->context = context; + mp->punt.rx_sw_if_index = htonl (sw_if_index); + mp->punt.tx_sw_if_index = htonl (pr->tx_sw_if_index); + if (is_ipv6) + { + ip_address_encode (&pr->nh, IP46_TYPE_IP6, &mp->punt.nh); + } + else + { + ip_address_encode (&pr->nh, IP46_TYPE_IP4, &mp->punt.nh); + } + + vl_api_send_msg (reg, (u8 *) mp); +} + +static void +vl_api_ip_punt_redirect_dump_t_handler (vl_api_ip_punt_redirect_dump_t * mp) +{ + vl_api_registration_t *reg; + u32 sw_if_index; + int rv __attribute__ ((unused)) = 0; + + sw_if_index = ntohl (mp->sw_if_index); + reg = vl_api_client_index_to_registration (mp->client_index); + if (!reg) + return; + + if (~0 != sw_if_index) + VALIDATE_SW_IF_INDEX (mp); + + ip_punt_redirect_detail_t *pr, *prs; + if (mp->is_ipv6) + { + prs = ip6_punt_redirect_entries (sw_if_index); + /* *INDENT-OFF* */ + vec_foreach (pr, prs) + { + send_ip_punt_redirect_details (reg, mp->context, pr->rx_sw_if_index, &pr->punt_redirect, 1); + } + /* *INDENT-ON* */ + vec_free (prs); + } + else + { + prs = ip4_punt_redirect_entries (sw_if_index); + /* *INDENT-OFF* */ + vec_foreach (pr, prs) + { + send_ip_punt_redirect_details (reg, mp->context, pr->rx_sw_if_index, &pr->punt_redirect, 0); + } + /* *INDENT-ON* */ + vec_free (prs); + } + + BAD_SW_IF_INDEX_LABEL; } #define vl_msg_name_crc_list