fib: Source Address Selection

[vpp.git] / src / plugins / ping / ping.c

diff --git a/src/plugins/ping/ping.c b/src/plugins/ping/ping.c
old mode 100755 (executable)
new mode 100644 (file)
index eaf5d29..98add53
--- a/src/plugins/ping/ping.c
+++ b/src/plugins/ping/ping.c
@@ -18,7 +18,8 @@
 #include <vlib/vlib.h>
 #include <vnet/fib/ip6_fib.h>
 #include <vnet/fib/ip4_fib.h>
-#include <vnet/fib/fib_entry.h>
+#include <vnet/fib/fib_sas.h>
+#include <vnet/ip/ip6_link.h>
 #include <vnet/plugin/plugin.h>
 #include <vpp/app/version.h>
 
@@ -473,8 +474,8 @@ ip4_icmp_echo_request (vlib_main_t * vm,
          ip0->checksum = ip_csum_fold (sum0);
          ip1->checksum = ip_csum_fold (sum1);
 
-         ASSERT (ip0->checksum == ip4_header_checksum (ip0));
-         ASSERT (ip1->checksum == ip4_header_checksum (ip1));
+         ASSERT (ip4_header_checksum_is_valid (ip0));
+         ASSERT (ip4_header_checksum_is_valid (ip1));
 
          p0->flags |= VNET_BUFFER_F_LOCALLY_ORIGINATED;
          p1->flags |= VNET_BUFFER_F_LOCALLY_ORIGINATED;
@@ -530,7 +531,7 @@ ip4_icmp_echo_request (vlib_main_t * vm,
 
          ip0->checksum = ip_csum_fold (sum0);
 
-         ASSERT (ip0->checksum == ip4_header_checksum (ip0));
+         ASSERT (ip4_header_checksum_is_valid (ip0));
 
          p0->flags |= VNET_BUFFER_F_LOCALLY_ORIGINATED;
        }
@@ -724,27 +725,22 @@ ip46_fill_l3_header (ip46_address_t * pa46, vlib_buffer_t * b0, int is_ip6)
     }
 }
 
-static int
+static bool
 ip46_set_src_address (u32 sw_if_index, vlib_buffer_t * b0, int is_ip6)
 {
-  int res;
+  bool res = false;
+
   if (is_ip6)
     {
-      ip6_main_t *im = &ip6_main;
       ip6_header_t *ip6 = vlib_buffer_get_current (b0);
-      res =
-       ip6_src_address_for_packet (&im->lookup_main, sw_if_index,
-                                   &ip6->dst_address, &ip6->src_address);
+
+      res = fib_sas6_get (sw_if_index, &ip6->dst_address, &ip6->src_address);
     }
   else
     {
-      ip4_main_t *im = &ip4_main;
       ip4_header_t *ip4 = vlib_buffer_get_current (b0);
-      res =
-       ip4_src_address_for_packet (&im->lookup_main, sw_if_index,
-                                   &ip4->src_address);
-      /* IP4 and IP6 paths have the inverse logic. Harmonize. */
-      res = !res;
+
+      res = fib_sas4_get (sw_if_index, &ip4->dst_address, &ip4->src_address);
     }
   return res;
 }
@@ -935,6 +931,8 @@ ip46_enqueue_packet (vlib_main_t * vm, vlib_buffer_t * b0, u32 burst,
    * we did not enqueue it here yet.
    */
 ship_and_ret:
+  ASSERT (n_to_send <= f->n_vectors);
+  f->n_vectors -= n_to_send;
   n_sent += f->n_vectors;
   vlib_put_frame_to_node (vm, lookup_node_index, f);
   return n_sent;