hs-test: fix LDPreloadIperfVppTest

[vpp.git] / src / vnet / udp / udp_encap.h

diff --git a/src/vnet/udp/udp_encap.h b/src/vnet/udp/udp_encap.h
index ac8e88b..c8b42ff 100644 (file)
--- a/src/vnet/udp/udp_encap.h
+++ b/src/vnet/udp/udp_encap.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Copyright (c) 2016-2019 Cisco and/or its affiliates.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at:
@@ -17,11 +17,11 @@
 #define __UDP_ENCAP_H__
 
 #include <vnet/ip/ip.h>
-#include <vnet/udp/udp.h>
+#include <vnet/udp/udp_packet.h>
 #include <vnet/fib/fib_node.h>
 
 /**
- * UDP encapsualtion.
+ * UDP encapsulation.
  * A representation of the encapsulation of packets in UDP-over-IP.
  * This is encapsulation only, there is no tunnel interface, hence
  * it is uni-directional. For decap register a handler with the UDP port
@@ -29,7 +29,7 @@
  */
 
 /**
- * Fixup behaviour. Actions performed on the encap in the data-plance
+ * Fixup behaviour. Actions performed on the encap in the data-plane
  */
 typedef enum udp_encap_fixup_flags_t_
 {
@@ -41,7 +41,7 @@ typedef enum udp_encap_fixup_flags_t_
 } udp_encap_fixup_flags_t;
 
 /**
- * The UDP encap represenation
+ * The UDP encap representation
  */
 typedef struct udp_encap_t_
 {
@@ -68,14 +68,14 @@ typedef struct udp_encap_t_
   } __attribute__ ((packed)) ue_hdrs;
 
   /**
-   * Flags controlling fixup behaviour
+   * The DPO used to forward to the next node in the VLIB graph
    */
-  udp_encap_fixup_flags_t ue_flags;
+  dpo_id_t ue_dpo;
 
   /**
-   * The DPO used to forward to the next node in the VLIB graph
+   * Flags controlling fixup behaviour
    */
-  dpo_id_t ue_dpo;
+  udp_encap_fixup_flags_t ue_flags;
 
   /**
    * the protocol of the IP header imposed
@@ -83,9 +83,9 @@ typedef struct udp_encap_t_
   fib_protocol_t ue_ip_proto;
 
   /**
-   * The seond cacheline contains control-plane data
+   * The second cacheline contains control-plane data
    */
-    CLIB_CACHE_LINE_ALIGN_MARK (cacheline1);
+  CLIB_CACHE_LINE_ALIGN_MARK (cacheline1);
 
   /**
    * linkage into the FIB graph
@@ -115,6 +115,7 @@ extern index_t udp_encap_add_and_lock (fib_protocol_t proto,
 extern void udp_encap_lock (index_t uei);
 extern void udp_encap_unlock (index_t uei);
 extern u8 *format_udp_encap (u8 * s, va_list * args);
+extern u8 *format_udp_encap_fixup_flags (u8 *s, va_list *args);
 extern void udp_encap_contribute_forwarding (index_t uei,
                                             dpo_proto_t proto,
                                             dpo_id_t * dpo);