fib: fib api updates

[vpp.git] / src / vnet / dhcp / dhcp6_proxy_node.c

diff --git a/src/vnet/dhcp/dhcp6_proxy_node.c b/src/vnet/dhcp/dhcp6_proxy_node.c
index e4464e0..a253fa1 100644 (file)
--- a/src/vnet/dhcp/dhcp6_proxy_node.c
+++ b/src/vnet/dhcp/dhcp6_proxy_node.c
@@ -316,7 +316,7 @@ dhcpv6_proxy_to_server_input (vlib_main_t * vm,
        link_address_set:
 
          if ((b0->current_length + sizeof (*id1) + sizeof (*vss1) +
-              sizeof (*cmac)) > vlib_bufer_get_default_size (vm))
+              sizeof (*cmac)) > vlib_buffer_get_default_data_size (vm))
            {
              error0 = DHCPV6_PROXY_ERROR_PKT_TOO_BIG;
              next0 = DHCPV6_PROXY_TO_SERVER_INPUT_NEXT_DROP;
@@ -436,7 +436,6 @@ dhcpv6_proxy_to_server_input (vlib_main_t * vm,
                  u32 ci0;
 
                  c0 = vlib_buffer_copy (vm, b0);
-                 vlib_buffer_copy_trace_flag (vm, c0, bi0);
                  VLIB_BUFFER_TRACE_TRAJECTORY_INIT (c0);
                  ci0 = vlib_get_buffer_index (vm, c0);
                  server = &proxy->dhcp_servers[ii];
@@ -461,6 +460,7 @@ dhcpv6_proxy_to_server_input (vlib_main_t * vm,
                    {
                      dhcpv6_proxy_trace_t *tr;
 
+                     vlib_buffer_copy_trace_flag (vm, b0, ci0);
                      tr = vlib_add_trace (vm, node, c0, sizeof (*tr));
                      tr->which = 0;    /* to server */
                      tr->error = error0;
@@ -893,16 +893,16 @@ dhcp6_proxy_set_server (ip46_address_t * addr,
        .frp_addr = zero_addr,
        .frp_sw_if_index = 0xffffffff,
        .frp_fib_index = ~0,
-       .frp_weight = 0,
+       .frp_weight = 1,
        .frp_flags = FIB_ROUTE_PATH_LOCAL,
+       .frp_mitf_flags = MFIB_ITF_FLAG_FORWARD,
       };
       if (dhcp_proxy_server_add (FIB_PROTOCOL_IP6, addr, src_addr,
                                 rx_fib_index, server_table_id))
        {
          mfib_table_entry_path_update (rx_fib_index,
                                        &all_dhcp_servers,
-                                       MFIB_SOURCE_DHCP,
-                                       &path_for_us, MFIB_ITF_FLAG_FORWARD);
+                                       MFIB_SOURCE_DHCP, &path_for_us);
          /*
           * Each interface that is enabled in this table, needs to be added
           * as an accepting interface, but this is not easily doable in VPP.