UDP Encapsulation.

[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 38f5b01..a55daa2 100644 (file)
--- a/src/vnet/mpls/mpls_api.c
+++ b/src/vnet/mpls/mpls_api.c
@@ -92,11 +92,11 @@ vl_api_mpls_table_add_del_t_handler (vl_api_mpls_table_add_del_t * mp)
   vnm->api_errno = 0;
 
   if (mp->mt_is_add)
-    mpls_table_create (ntohl (mp->mt_table_id), 1);
+    mpls_table_create (ntohl (mp->mt_table_id), 1, mp->mt_name);
   else
     mpls_table_delete (ntohl (mp->mt_table_id), 1);
 
-  rv = (rv == 0) ? vnm->api_errno : rv;
+  // NB: Nothing sets rv; none of the above returns an error
 
   REPLY_MACRO (VL_API_MPLS_TABLE_ADD_DEL_REPLY);
 }
@@ -219,25 +219,32 @@ mpls_route_add_del_t_handler (vnet_main_t * vnm,
        label_stack[ii] = ntohl (mp->mr_next_hop_out_label_stack[ii]);
     }
 
-  return (add_del_route_t_handler (mp->mr_is_multipath, mp->mr_is_add, 0,      // mp->is_drop,
+  /* *INDENT-OFF* */
+  return (add_del_route_t_handler (mp->mr_is_multipath, mp->mr_is_add,
+                                   0,  // mp->is_drop,
                                   0,   // mp->is_unreach,
                                   0,   // mp->is_prohibit,
                                   0,   // mp->is_local,
                                   mp->mr_is_multicast,
-                                  mp->mr_is_classify,
-                                  mp->mr_classify_table_index,
-                                  mp->mr_is_resolve_host,
-                                  mp->mr_is_resolve_attached,
-                                  mp->mr_is_interface_rx,
-                                  mp->mr_is_rpf_id,
+                                   mp->mr_is_classify,
+                                   mp->mr_classify_table_index,
+                                   mp->mr_is_resolve_host,
+                                   mp->mr_is_resolve_attached,
+                                   mp->mr_is_interface_rx,
+                                   mp->mr_is_rpf_id,
+                                   0,  // l2_bridged
+                                   0,   // is source_lookup
+                                   0,   // is_udp_encap
                                   fib_index, &pfx,
                                   mp->mr_next_hop_proto,
-                                  &nh, ntohl (mp->mr_next_hop_sw_if_index),
+                                  &nh, ~0, // next_hop_id
+                                   ntohl (mp->mr_next_hop_sw_if_index),
                                   next_hop_fib_index,
                                   mp->mr_next_hop_weight,
                                   mp->mr_next_hop_preference,
                                   ntohl (mp->mr_next_hop_via_label),
                                   label_stack));
+  /* *INDENT-ON* */
 }
 
 void
@@ -258,7 +265,7 @@ vl_api_mpls_route_add_del_t_handler (vl_api_mpls_route_add_del_t * mp)
 }
 
 void
-mpls_table_create (u32 table_id, u8 is_api)
+mpls_table_create (u32 table_id, u8 is_api, const u8 * name)
 {
   u32 fib_index;
 
@@ -276,10 +283,11 @@ mpls_table_create (u32 table_id, u8 is_api)
 
   if (~0 == fib_index)
     {
-      fib_table_find_or_create_and_lock (FIB_PROTOCOL_MPLS,
-                                        table_id,
-                                        (is_api ?
-                                         FIB_SOURCE_API : FIB_SOURCE_CLI));
+      fib_table_find_or_create_and_lock_w_name (FIB_PROTOCOL_MPLS,
+                                               table_id,
+                                               (is_api ?
+                                                FIB_SOURCE_API :
+                                                FIB_SOURCE_CLI), name);
     }
 }
 
@@ -424,7 +432,8 @@ vl_api_mpls_tunnel_dump_t_handler (vl_api_mpls_tunnel_dump_t * mp)
 static void
 send_mpls_fib_details (vpe_api_main_t * am,
                       unix_shared_memory_queue_t * q,
-                      u32 table_id, u32 label, u32 eos,
+                      const fib_table_t * table,
+                      u32 label, u32 eos,
                       fib_route_path_encode_t * api_rpaths, u32 context)
 {
   vl_api_mpls_fib_details_t *mp;
@@ -440,7 +449,9 @@ send_mpls_fib_details (vpe_api_main_t * am,
   mp->_vl_msg_id = ntohs (VL_API_MPLS_FIB_DETAILS);
   mp->context = context;
 
-  mp->table_id = htonl (table_id);
+  mp->table_id = htonl (table->ft_table_id);
+  memcpy (mp->table_name, table->ft_desc,
+         clib_min (vec_len (table->ft_desc), sizeof (mp->table_name)));
   mp->eos_bit = eos;
   mp->label = htonl (label);
 
@@ -512,8 +523,8 @@ vl_api_mpls_fib_dump_t_handler (vl_api_mpls_fib_dump_t * mp)
     api_rpaths = NULL;
     fib_entry_encode (*lfeip, &api_rpaths);
     send_mpls_fib_details (am, q,
-                          fib_table->ft_table_id,
-                          pfx.fp_label, pfx.fp_eos, api_rpaths, mp->context);
+                          fib_table, pfx.fp_label,
+                          pfx.fp_eos, api_rpaths, mp->context);
     vec_free (api_rpaths);
   }