Fix handling of mpls_tunnel_add_del API

[vpp.git] / src / vnet / mpls / mpls_api.c

diff --git a/src/vnet/mpls/mpls_api.c b/src/vnet/mpls/mpls_api.c
index dbd1d8b..84532bf 100644 (file)
--- a/src/vnet/mpls/mpls_api.c
+++ b/src/vnet/mpls/mpls_api.c
@@ -311,12 +311,10 @@ mpls_table_create (u32 table_id, u8 is_api, const u8 * name)
 static void
 vl_api_mpls_tunnel_add_del_t_handler (vl_api_mpls_tunnel_add_del_t * mp)
 {
+  u32 tunnel_sw_if_index = ~0, tunnel_index = ~0, next_hop_via_label;
   vl_api_mpls_tunnel_add_del_reply_t *rmp;
-  int rv = 0;
-  u32 tunnel_sw_if_index;
-  int ii;
   fib_route_path_t rpath, *rpaths = NULL;
-  u32 next_hop_via_label;
+  int ii, rv = 0;
 
   memset (&rpath, 0, sizeof (rpath));
 
@@ -335,7 +333,8 @@ vl_api_mpls_tunnel_add_del_t_handler (vl_api_mpls_tunnel_add_del_t * mp)
                   mp->mt_next_hop, sizeof (rpath.frp_addr.ip6));
     }
   rpath.frp_sw_if_index = ntohl (mp->mt_next_hop_sw_if_index);
-  rpath.frp_weight = 1;
+  rpath.frp_weight = mp->mt_next_hop_weight;
+  rpath.frp_preference = mp->mt_next_hop_preference;
 
   next_hop_via_label = ntohl (mp->mt_next_hop_via_label);
   if ((MPLS_LABEL_INVALID != next_hop_via_label) && (0 != next_hop_via_label))
@@ -345,6 +344,18 @@ vl_api_mpls_tunnel_add_del_t_handler (vl_api_mpls_tunnel_add_del_t * mp)
       rpath.frp_eos = MPLS_NON_EOS;
     }
 
+  if (rpath.frp_sw_if_index == ~0)
+    {                          /* recursive path, set fib index */
+      rpath.frp_fib_index =
+       fib_table_find (dpo_proto_to_fib (rpath.frp_proto),
+                       ntohl (mp->mt_next_hop_table_id));
+      if (rpath.frp_fib_index == ~0)
+       {
+         rv = VNET_API_ERROR_NO_SUCH_FIB;
+         goto out;
+       }
+    }
+
   if (mp->mt_is_add)
     {
       for (ii = 0; ii < mp->mt_next_hop_n_out_labels; ii++)
@@ -370,9 +381,12 @@ vl_api_mpls_tunnel_add_del_t_handler (vl_api_mpls_tunnel_add_del_t * mp)
        tunnel_sw_if_index = vnet_mpls_tunnel_create (mp->mt_l2_only,
                                                      mp->mt_is_multicast);
       vnet_mpls_tunnel_path_add (tunnel_sw_if_index, rpaths);
+
+      tunnel_index = vnet_mpls_tunnel_get_index (tunnel_sw_if_index);
     }
   else
     {
+      tunnel_index = vnet_mpls_tunnel_get_index (tunnel_sw_if_index);
       tunnel_sw_if_index = ntohl (mp->mt_sw_if_index);
       if (!vnet_mpls_tunnel_path_remove (tunnel_sw_if_index, rpaths))
        vnet_mpls_tunnel_del (tunnel_sw_if_index);
@@ -382,10 +396,12 @@ vl_api_mpls_tunnel_add_del_t_handler (vl_api_mpls_tunnel_add_del_t * mp)
 
   stats_dsunlock ();
 
+out:
   /* *INDENT-OFF* */
   REPLY_MACRO2(VL_API_MPLS_TUNNEL_ADD_DEL_REPLY,
   ({
     rmp->sw_if_index = ntohl(tunnel_sw_if_index);
+    rmp->tunnel_index = ntohl(tunnel_index);
   }));
   /* *INDENT-ON* */
 }
@@ -410,7 +426,7 @@ static void
 typedef struct mpls_tunnel_send_walk_ctx_t_
 {
   vl_api_registration_t *reg;
-  u32 index;
+  u32 sw_if_index;
   u32 context;
 } mpls_tunnel_send_walk_ctx_t;
 
@@ -426,10 +442,11 @@ send_mpls_tunnel_entry (u32 mti, void *arg)
 
   ctx = arg;
 
-  if (~0 != ctx->index && mti != ctx->index)
+  mt = mpls_tunnel_get (mti);
+
+  if (~0 != ctx->sw_if_index && mt->mt_sw_if_index != ctx->sw_if_index)
     return;
 
-  mt = mpls_tunnel_get (mti);
   n = fib_path_list_get_n_paths (mt->mt_path_list);
 
   mp = vl_msg_api_alloc (sizeof (*mp) + n * sizeof (vl_api_fib_path_t));
@@ -439,6 +456,7 @@ send_mpls_tunnel_entry (u32 mti, void *arg)
   mp->context = ctx->context;
 
   mp->mt_tunnel_index = ntohl (mti);
+  mp->mt_sw_if_index = ntohl (mt->mt_sw_if_index);
   mp->mt_count = ntohl (n);
 
   fib_path_list_walk (mt->mt_path_list, fib_path_encode, &api_rpaths);
@@ -450,11 +468,6 @@ send_mpls_tunnel_entry (u32 mti, void *arg)
     fp++;
   }
 
-  // FIXME
-  // memcpy (mp->mt_next_hop_out_labels,
-  //   mt->mt_label_stack, nlabels * sizeof (u32));
-
-
   vl_api_send_msg (ctx->reg, (u8 *) mp);
 }
 
@@ -469,7 +482,7 @@ vl_api_mpls_tunnel_dump_t_handler (vl_api_mpls_tunnel_dump_t * mp)
 
   mpls_tunnel_send_walk_ctx_t ctx = {
     .reg = reg,
-    .index = ntohl (mp->tunnel_index),
+    .sw_if_index = ntohl (mp->sw_if_index),
     .context = mp->context,
   };
   mpls_tunnel_walk (send_mpls_tunnel_entry, &ctx);