Coverity errors in MPLS code

[vpp.git] / vpp / vpp-api / api.c

diff --git a/vpp/vpp-api/api.c b/vpp/vpp-api/api.c
index 77cc89f..b778d3c 100644 (file)
--- a/vpp/vpp-api/api.c
+++ b/vpp/vpp-api/api.c
@@ -1733,24 +1733,27 @@ vl_api_l2fib_add_del_t_handler (vl_api_l2fib_add_del_t * mp)
 
   if (mp->is_add)
     {
-      VALIDATE_SW_IF_INDEX (mp);
-      if (vec_len (l2im->configs) <= sw_if_index)
-       {
-         rv = VNET_API_ERROR_INVALID_SW_IF_INDEX;
-         goto bad_sw_if_index;
-       }
-      else
+      filter_mac = mp->filter_mac ? 1 : 0;
+      if (filter_mac == 0)
        {
-         l2_input_config_t *config;
-         config = vec_elt_at_index (l2im->configs, sw_if_index);
-         if (config->bridge == 0)
+         VALIDATE_SW_IF_INDEX (mp);
+         if (vec_len (l2im->configs) <= sw_if_index)
            {
              rv = VNET_API_ERROR_INVALID_SW_IF_INDEX;
              goto bad_sw_if_index;
            }
+         else
+           {
+             l2_input_config_t *config;
+             config = vec_elt_at_index (l2im->configs, sw_if_index);
+             if (config->bridge == 0)
+               {
+                 rv = VNET_API_ERROR_INVALID_SW_IF_INDEX;
+                 goto bad_sw_if_index;
+               }
+           }
        }
       static_mac = mp->static_mac ? 1 : 0;
-      filter_mac = mp->filter_mac ? 1 : 0;
       bvi_mac = mp->bvi_mac ? 1 : 0;
       l2fib_add_entry (mac, bd_index, sw_if_index, static_mac, filter_mac,
                       bvi_mac);
@@ -2146,7 +2149,8 @@ vl_api_mpls_tunnel_add_del_t_handler (vl_api_mpls_tunnel_add_del_t * mp)
     }
   else
     {
-      vnet_mpls_tunnel_del (ntohl (mp->mt_sw_if_index));
+      tunnel_sw_if_index = ntohl (mp->mt_sw_if_index);
+      vnet_mpls_tunnel_del (tunnel_sw_if_index);
     }
 
   dsunlock (sm);
@@ -4542,8 +4546,7 @@ static void send_vxlan_tunnel_details
     }
   rmp->mcast_sw_if_index = htonl (t->mcast_sw_if_index);
   rmp->vni = htonl (t->vni);
-  /* decap_next_index is deprecated, hard code to l2-input */
-  rmp->decap_next_index = htonl (VXLAN_INPUT_NEXT_L2_INPUT);
+  rmp->decap_next_index = htonl (t->decap_next_index);
   rmp->sw_if_index = htonl (t->sw_if_index);
   rmp->is_ipv6 = is_ipv6;
   rmp->context = context;