udp: add udp encap source port entropy support

[vpp.git] / src / vnet / udp / udp_encap_node.c

diff --git a/src/vnet/udp/udp_encap_node.c b/src/vnet/udp/udp_encap_node.c
index 1ebe795..639ac23 100644 (file)
--- a/src/vnet/udp/udp_encap_node.c
+++ b/src/vnet/udp/udp_encap_node.c
@@ -20,12 +20,16 @@ typedef struct udp4_encap_trace_t_
 {
   udp_header_t udp;
   ip4_header_t ip;
+  u32 flow_hash;
+  udp_encap_fixup_flags_t flags;
 } udp4_encap_trace_t;
 
 typedef struct udp6_encap_trace_t_
 {
   udp_header_t udp;
   ip6_header_t ip;
+  u32 flow_hash;
+  udp_encap_fixup_flags_t flags;
 } udp6_encap_trace_t;
 
 extern vlib_combined_counter_main_t udp_encap_counters;
@@ -35,13 +39,16 @@ format_udp4_encap_trace (u8 * s, va_list * args)
 {
   CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
   CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
+  u32 indent = format_get_indent (s);
   udp4_encap_trace_t *t;
 
   t = va_arg (*args, udp4_encap_trace_t *);
 
-  s = format (s, "%U\n  %U",
-             format_ip4_header, &t->ip, sizeof (t->ip),
-             format_udp_header, &t->udp, sizeof (t->udp));
+  s = format (s, "flags: %U, flow hash: 0x%08x\n%U%U\n%U%U",
+             format_udp_encap_fixup_flags, t->flags, t->flow_hash,
+             format_white_space, indent, format_ip4_header, &t->ip,
+             sizeof (t->ip), format_white_space, indent, format_udp_header,
+             &t->udp, sizeof (t->udp));
   return (s);
 }
 
@@ -50,13 +57,16 @@ format_udp6_encap_trace (u8 * s, va_list * args)
 {
   CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
   CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
+  u32 indent = format_get_indent (s);
   udp6_encap_trace_t *t;
 
   t = va_arg (*args, udp6_encap_trace_t *);
 
-  s = format (s, "%U\n  %U",
-             format_ip6_header, &t->ip, sizeof (t->ip),
-             format_udp_header, &t->udp, sizeof (t->udp));
+  s = format (s, "flags: %U, flow hash: 0x%08x\n%U%U\n%U%U",
+             format_udp_encap_fixup_flags, t->flags, t->flow_hash,
+             format_white_space, indent, format_ip6_header, &t->ip,
+             sizeof (t->ip), format_white_space, indent, format_udp_header,
+             &t->udp, sizeof (t->udp));
   return (s);
 }
 
@@ -127,13 +137,16 @@ udp_encap_inline (vlib_main_t *vm, vlib_node_runtime_t *node,
                sizeof (udp_header_t) + sizeof (ip6_header_t);
              ip_udp_encap_two (vm, b0, b1, (u8 *) &ue0->ue_hdrs,
                                (u8 *) &ue1->ue_hdrs, n_bytes, encap_family,
-                               payload_family);
+                               payload_family, ue0->ue_flags, ue1->ue_flags);
+
              if (PREDICT_FALSE (b0->flags & VLIB_BUFFER_IS_TRACED))
                {
                  udp6_encap_trace_t *tr =
                    vlib_add_trace (vm, node, b0, sizeof (*tr));
                  tr->udp = ue0->ue_hdrs.ip6.ue_udp;
                  tr->ip = ue0->ue_hdrs.ip6.ue_ip6;
+                 tr->flags = ue0->ue_flags;
+                 tr->flow_hash = vnet_buffer (b0)->ip.flow_hash;
                }
              if (PREDICT_FALSE (b1->flags & VLIB_BUFFER_IS_TRACED))
                {
@@ -141,6 +154,8 @@ udp_encap_inline (vlib_main_t *vm, vlib_node_runtime_t *node,
                    vlib_add_trace (vm, node, b1, sizeof (*tr));
                  tr->udp = ue1->ue_hdrs.ip6.ue_udp;
                  tr->ip = ue1->ue_hdrs.ip6.ue_ip6;
+                 tr->flags = ue1->ue_flags;
+                 tr->flow_hash = vnet_buffer (b1)->ip.flow_hash;
                }
            }
          else
@@ -150,7 +165,7 @@ udp_encap_inline (vlib_main_t *vm, vlib_node_runtime_t *node,
 
              ip_udp_encap_two (vm, b0, b1, (u8 *) &ue0->ue_hdrs,
                                (u8 *) &ue1->ue_hdrs, n_bytes, encap_family,
-                               payload_family);
+                               payload_family, ue0->ue_flags, ue1->ue_flags);
 
              if (PREDICT_FALSE (b0->flags & VLIB_BUFFER_IS_TRACED))
                {
@@ -158,6 +173,8 @@ udp_encap_inline (vlib_main_t *vm, vlib_node_runtime_t *node,
                    vlib_add_trace (vm, node, b0, sizeof (*tr));
                  tr->udp = ue0->ue_hdrs.ip4.ue_udp;
                  tr->ip = ue0->ue_hdrs.ip4.ue_ip4;
+                 tr->flags = ue0->ue_flags;
+                 tr->flow_hash = vnet_buffer (b0)->ip.flow_hash;
                }
              if (PREDICT_FALSE (b1->flags & VLIB_BUFFER_IS_TRACED))
                {
@@ -165,6 +182,8 @@ udp_encap_inline (vlib_main_t *vm, vlib_node_runtime_t *node,
                    vlib_add_trace (vm, node, b1, sizeof (*tr));
                  tr->udp = ue1->ue_hdrs.ip4.ue_udp;
                  tr->ip = ue1->ue_hdrs.ip4.ue_ip4;
+                 tr->flags = ue1->ue_flags;
+                 tr->flow_hash = vnet_buffer (b1)->ip.flow_hash;
                }
            }
 
@@ -208,7 +227,7 @@ udp_encap_inline (vlib_main_t *vm, vlib_node_runtime_t *node,
              const u8 n_bytes =
                sizeof (udp_header_t) + sizeof (ip6_header_t);
              ip_udp_encap_one (vm, b0, (u8 *) &ue0->ue_hdrs.ip6, n_bytes,
-                               encap_family, payload_family);
+                               encap_family, payload_family, ue0->ue_flags);
 
              if (PREDICT_FALSE (b0->flags & VLIB_BUFFER_IS_TRACED))
                {
@@ -216,6 +235,8 @@ udp_encap_inline (vlib_main_t *vm, vlib_node_runtime_t *node,
                    vlib_add_trace (vm, node, b0, sizeof (*tr));
                  tr->udp = ue0->ue_hdrs.ip6.ue_udp;
                  tr->ip = ue0->ue_hdrs.ip6.ue_ip6;
+                 tr->flags = ue0->ue_flags;
+                 tr->flow_hash = vnet_buffer (b0)->ip.flow_hash;
                }
            }
          else
@@ -224,7 +245,7 @@ udp_encap_inline (vlib_main_t *vm, vlib_node_runtime_t *node,
                sizeof (udp_header_t) + sizeof (ip4_header_t);
 
              ip_udp_encap_one (vm, b0, (u8 *) &ue0->ue_hdrs.ip4, n_bytes,
-                               encap_family, payload_family);
+                               encap_family, payload_family, ue0->ue_flags);
 
              if (PREDICT_FALSE (b0->flags & VLIB_BUFFER_IS_TRACED))
                {
@@ -232,6 +253,8 @@ udp_encap_inline (vlib_main_t *vm, vlib_node_runtime_t *node,
                    vlib_add_trace (vm, node, b0, sizeof (*tr));
                  tr->udp = ue0->ue_hdrs.ip4.ue_udp;
                  tr->ip = ue0->ue_hdrs.ip4.ue_ip4;
+                 tr->flags = ue0->ue_flags;
+                 tr->flow_hash = vnet_buffer (b0)->ip.flow_hash;
                }
            }