diff options
author | Neale Ranns <nranns@cisco.com> | 2019-11-25 13:04:44 +0000 |
---|---|---|
committer | Ole Trøan <otroan@employees.org> | 2019-12-03 19:36:26 +0000 |
commit | 9534696b4637185c9f296375e63c50d8976d153d (patch) | |
tree | 7e5bce5d492b6b376e42f9df175e18202f93af68 /src/vnet/ipip/ipip.h | |
parent | c8972fe506c78530a3e4085453e86a0b85b245ef (diff) |
ipip: Tunnel flags controlling copying data to/from payload/encap
Type: feature
Signed-off-by: Neale Ranns <nranns@cisco.com>
Change-Id: I9467f11775936754406892b8e9e275f989ac9b30
Diffstat (limited to 'src/vnet/ipip/ipip.h')
-rw-r--r-- | src/vnet/ipip/ipip.h | 28 |
1 files changed, 26 insertions, 2 deletions
diff --git a/src/vnet/ipip/ipip.h b/src/vnet/ipip/ipip.h index c55d1d7c644..be944507b40 100644 --- a/src/vnet/ipip/ipip.h +++ b/src/vnet/ipip/ipip.h @@ -65,6 +65,28 @@ typedef enum } ipip_mode_t; /** + * Keep these idenitical to those in ipip.api + */ +#define forech_ipip_tunnel_flag \ + _(NONE, "none", 0x0) \ + _(ENCAP_COPY_DF, "encap-copy-df", 0x1) \ + _(ENCAP_SET_DF, "encap-set-df", 0x2) \ + _(ENCAP_COPY_DSCP, "encap-copy-dscp", 0x4) \ + _(ENCAP_COPY_ECN, "encap-copy-ecn", 0x8) \ + _(DECAP_COPY_ECN, "decap-copy-ecn", 0x10) + +typedef enum ipip_tunnel_flags_t_ +{ +#define _(a,b,c) IPIP_TUNNEL_FLAG_##a = c, + forech_ipip_tunnel_flag +#undef _ +} __clib_packed ipip_tunnel_flags_t; + +#define IPIP_TUNNEL_FLAG_MASK (0x1f) + +extern u8 *format_ipip_tunnel_flags (u8 * s, va_list * args); + +/** * @brief A representation of a IPIP tunnel */ typedef struct @@ -82,7 +104,8 @@ typedef struct u32 sw_if_index; u32 dev_instance; /* Real device instance in tunnel vector */ u32 user_instance; /* Instance name being shown to user */ - u8 tc_tos; + ipip_tunnel_flags_t flags; + ip_dscp_t dscp; struct { @@ -143,7 +166,8 @@ sixrd_get_addr_net (const ipip_tunnel_t * t, u64 dal) int ipip_add_tunnel (ipip_transport_t transport, u32 instance, ip46_address_t * src, ip46_address_t * dst, - u32 fib_index, u8 tc_tos, u32 * sw_if_indexp); + u32 fib_index, ipip_tunnel_flags_t flags, + ip_dscp_t dscp, u32 * sw_if_indexp); int ipip_del_tunnel (u32 sw_if_index); int sixrd_add_tunnel (ip6_address_t * ip6_prefix, u8 ip6_prefix_len, ip4_address_t * ip4_prefix, u8 ip4_prefix_len, |