BIER
[vpp.git] / src / vnet / mpls / mpls_api.c
index e41466e..f345ca6 100644 (file)
@@ -219,19 +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, 0,       // l2_bridged
+                                  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,
+                                   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
@@ -353,7 +366,7 @@ typedef struct mpls_tunnel_send_walk_ctx_t_
 static void
 send_mpls_tunnel_entry (u32 mti, void *arg)
 {
-  fib_route_path_encode_t *api_rpaths, *api_rpath;
+  fib_route_path_encode_t *api_rpaths = NULL, *api_rpath;
   mpls_tunnel_send_walk_ctx_t *ctx;
   vl_api_mpls_tunnel_details_t *mp;
   const mpls_tunnel_t *mt;