X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fip%2Fip_api.c;h=d5fa2d32f21819065d27bec78b34525997cbfdb4;hb=7784140f2bd2d5ae44f2be1507ac25f102006155;hp=4f5b6b9d0a64ac34453709089f5181b2206f4743;hpb=cbe25aab3be72154f2c706c39eeba6a77f34450f;p=vpp.git

diff --git a/src/vnet/ip/ip_api.c b/src/vnet/ip/ip_api.c
index 4f5b6b9d0a6..d5fa2d32f21 100644
--- a/src/vnet/ip/ip_api.c
+++ b/src/vnet/ip/ip_api.c
@@ -94,8 +94,6 @@ _(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)                                    \
  _(SW_INTERFACE_IP6_SET_LINK_LOCAL_ADDRESS,                             \
    sw_interface_ip6_set_link_local_address)                             \
 _(IP_REASSEMBLY_SET, ip_reassembly_set)                                 \
@@ -113,7 +111,7 @@ static void
   VALIDATE_SW_IF_INDEX (mp);
 
   rv = ((mp->enable == 1) ?
-	ip6_link_enable (ntohl (mp->sw_if_index)) :
+	ip6_link_enable (ntohl (mp->sw_if_index), NULL) :
 	ip6_link_disable (ntohl (mp->sw_if_index)));
 
   BAD_SW_IF_INDEX_LABEL;
@@ -1264,43 +1262,12 @@ static void
 
   ip6_address_decode (mp->ip, &ip);
 
-  rv = ip6_set_link_local_address (ntohl (mp->sw_if_index), &ip);
+  rv = ip6_link_set_local_address (ntohl (mp->sw_if_index), &ip);
 
   BAD_SW_IF_INDEX_LABEL;
   REPLY_MACRO (VL_API_SW_INTERFACE_IP6_SET_LINK_LOCAL_ADDRESS_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);
-}
-
-
 static void
 vl_api_ip_table_replace_begin_t_handler (vl_api_ip_table_replace_begin_t * mp)
 {
@@ -1577,13 +1544,14 @@ static void
 vl_api_ip_punt_redirect_dump_t_handler (vl_api_ip_punt_redirect_dump_t * mp)
 {
   vl_api_registration_t *reg;
-  fib_protocol_t fproto;
+  fib_protocol_t fproto = FIB_PROTOCOL_IP4;
 
   reg = vl_api_client_index_to_registration (mp->client_index);
   if (!reg)
     return;
 
-  fproto = mp->is_ipv6 ? FIB_PROTOCOL_IP6 : FIB_PROTOCOL_IP4;
+  if (mp->is_ipv6 == 1)
+    fproto = FIB_PROTOCOL_IP6;
 
   ip_punt_redirect_walk_ctx_t ctx = {
     .reg = reg,