Enforce Bridge Domain ID range to match 24-bit VNI range

[vpp.git] / src / vnet / map / ip6_map.c

diff --git a/src/vnet/map/ip6_map.c b/src/vnet/map/ip6_map.c
index f7eb768..720d13c 100644 (file)
--- a/src/vnet/map/ip6_map.c
+++ b/src/vnet/map/ip6_map.c
@@ -15,6 +15,8 @@
 #include "map.h"
 
 #include "../ip/ip_frag.h"
+#include <vnet/ip/ip4_to_ip6.h>
+#include <vnet/ip/ip6_to_ip4.h>
 
 enum ip6_map_next_e
 {
@@ -125,7 +127,7 @@ ip6_map_security_check (map_domain_t * d, ip4_header_t * ip4,
        {
          if (!ip4_is_fragment (ip4))
            {
-             u16 port = ip4_map_get_port (ip4, MAP_SENDER);
+             u16 port = ip4_get_port (ip4, 1);
              if (port)
                {
                  if (mm->sec_check)
@@ -172,7 +174,7 @@ ip6_map (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * frame)
     vlib_node_get_runtime (vm, ip6_map_node.index);
   map_main_t *mm = &map_main;
   vlib_combined_counter_main_t *cm = mm->domain_counters;
-  u32 cpu_index = os_get_cpu_number ();
+  u32 thread_index = vlib_get_thread_index ();
 
   from = vlib_frame_vector_args (frame);
   n_left_from = frame->n_vectors;
@@ -243,8 +245,9 @@ ip6_map (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * frame)
            {
              d0 =
                ip6_map_get_domain (vnet_buffer (p0)->ip.adj_index[VLIB_TX],
-                                   (ip4_address_t *) & ip40->src_address.
-                                   as_u32, &map_domain_index0, &error0);
+                                   (ip4_address_t *) & ip40->
+                                   src_address.as_u32, &map_domain_index0,
+                                   &error0);
            }
          else if (ip60->protocol == IP_PROTOCOL_ICMP6 &&
                   clib_net_to_host_u16 (ip60->payload_length) >
@@ -270,8 +273,9 @@ ip6_map (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * frame)
            {
              d1 =
                ip6_map_get_domain (vnet_buffer (p1)->ip.adj_index[VLIB_TX],
-                                   (ip4_address_t *) & ip41->src_address.
-                                   as_u32, &map_domain_index1, &error1);
+                                   (ip4_address_t *) & ip41->
+                                   src_address.as_u32, &map_domain_index1,
+                                   &error1);
            }
          else if (ip61->protocol == IP_PROTOCOL_ICMP6 &&
                   clib_net_to_host_u16 (ip61->payload_length) >
@@ -319,7 +323,7 @@ ip6_map (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * frame)
                        IP6_MAP_NEXT_IP4_REWRITE : next0;
                    }
                  vlib_increment_combined_counter (cm + MAP_DOMAIN_COUNTER_RX,
-                                                  cpu_index,
+                                                  thread_index,
                                                   map_domain_index0, 1,
                                                   clib_net_to_host_u16
                                                   (ip40->length));
@@ -352,7 +356,7 @@ ip6_map (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * frame)
                        IP6_MAP_NEXT_IP4_REWRITE : next1;
                    }
                  vlib_increment_combined_counter (cm + MAP_DOMAIN_COUNTER_RX,
-                                                  cpu_index,
+                                                  thread_index,
                                                   map_domain_index1, 1,
                                                   clib_net_to_host_u16
                                                   (ip41->length));
@@ -454,8 +458,9 @@ ip6_map (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * frame)
            {
              d0 =
                ip6_map_get_domain (vnet_buffer (p0)->ip.adj_index[VLIB_TX],
-                                   (ip4_address_t *) & ip40->src_address.
-                                   as_u32, &map_domain_index0, &error0);
+                                   (ip4_address_t *) & ip40->
+                                   src_address.as_u32, &map_domain_index0,
+                                   &error0);
            }
          else if (ip60->protocol == IP_PROTOCOL_ICMP6 &&
                   clib_net_to_host_u16 (ip60->payload_length) >
@@ -505,7 +510,7 @@ ip6_map (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * frame)
                        IP6_MAP_NEXT_IP4_REWRITE : next0;
                    }
                  vlib_increment_combined_counter (cm + MAP_DOMAIN_COUNTER_RX,
-                                                  cpu_index,
+                                                  thread_index,
                                                   map_domain_index0, 1,
                                                   clib_net_to_host_u16
                                                   (ip40->length));
@@ -820,7 +825,7 @@ ip6_map_ip4_reass (vlib_main_t * vm,
     vlib_node_get_runtime (vm, ip6_map_ip4_reass_node.index);
   map_main_t *mm = &map_main;
   vlib_combined_counter_main_t *cm = mm->domain_counters;
-  u32 cpu_index = os_get_cpu_number ();
+  u32 thread_index = vlib_get_thread_index ();
   u32 *fragments_to_drop = NULL;
   u32 *fragments_to_loopback = NULL;
 
@@ -891,9 +896,7 @@ ip6_map_ip4_reass (vlib_main_t * vm,
                  cached = 1;
                }
            }
-         else
-           if ((port0 =
-                ip4_get_port (ip40, MAP_SENDER, p0->current_length)) < 0)
+         else if ((port0 = ip4_get_port (ip40, 1)) == 0)
            {
              // Could not find port from first fragment. Stop reassembling.
              error0 = MAP_ERROR_BAD_PROTOCOL;
@@ -958,8 +961,8 @@ ip6_map_ip4_reass (vlib_main_t * vm,
            {
              if (error0 == MAP_ERROR_NONE)
                vlib_increment_combined_counter (cm + MAP_DOMAIN_COUNTER_RX,
-                                                cpu_index, map_domain_index0,
-                                                1,
+                                                thread_index,
+                                                map_domain_index0, 1,
                                                 clib_net_to_host_u16
                                                 (ip40->length));
              next0 =
@@ -1015,7 +1018,7 @@ ip6_map_icmp_relay (vlib_main_t * vm,
   vlib_node_runtime_t *error_node =
     vlib_node_get_runtime (vm, ip6_map_icmp_relay_node.index);
   map_main_t *mm = &map_main;
-  u32 cpu_index = os_get_cpu_number ();
+  u32 thread_index = vlib_get_thread_index ();
   u16 *fragment_ids, *fid;
 
   from = vlib_frame_vector_args (frame);
@@ -1143,7 +1146,8 @@ ip6_map_icmp_relay (vlib_main_t * vm,
          ip_csum_t sum = ip_incremental_checksum (0, new_icmp40, nlen - 20);
          new_icmp40->checksum = ~ip_csum_fold (sum);
 
-         vlib_increment_simple_counter (&mm->icmp_relayed, cpu_index, 0, 1);
+         vlib_increment_simple_counter (&mm->icmp_relayed, thread_index, 0,
+                                        1);
 
        error:
          if (PREDICT_FALSE (p0->flags & VLIB_BUFFER_IS_TRACED))