diff options
author | Neale Ranns <neale@graphiant.com> | 2021-02-04 11:02:52 +0000 |
---|---|---|
committer | Ole Tr�an <otroan@employees.org> | 2021-02-08 11:44:00 +0000 |
commit | a91cb45909642978592c7e21a8f6d2da2e44e506 (patch) | |
tree | eab3c645e03cba2707555647cb61e83ffedef42f /src/vnet/tunnel/tunnel_types_api.c | |
parent | 7d527a2292bdabc84ff070f5b27f35c0e858cddd (diff) |
tunnel: support copying TTL and flow label from inner to outer
Type: feature
The added functionality is to support copying TTL and flow label from
inner to outer. The .api was extened to support expressing this and also
adding a common tunnel endpoint type. i find it best to make API changes
in one patch so there are less versions of the API.
Signed-off-by: Neale Ranns <neale@graphiant.com>
Change-Id: I755c1e3f4c475058792af39c1abeda92129efb76
Diffstat (limited to 'src/vnet/tunnel/tunnel_types_api.c')
-rw-r--r-- | src/vnet/tunnel/tunnel_types_api.c | 82 |
1 files changed, 81 insertions, 1 deletions
diff --git a/src/vnet/tunnel/tunnel_types_api.c b/src/vnet/tunnel/tunnel_types_api.c index 1d48178e9df..894eecb8407 100644 --- a/src/vnet/tunnel/tunnel_types_api.c +++ b/src/vnet/tunnel/tunnel_types_api.c @@ -17,6 +17,8 @@ #include <vnet/api_errno.h> #include <vnet/tunnel/tunnel_types_api.h> +#include <vnet/ip/ip_types_api.h> +#include <vnet/fib/fib_table.h> #include <vnet/tunnel/tunnel_types.api_enum.h> #include <vnet/tunnel/tunnel_types.api_types.h> @@ -25,12 +27,14 @@ STATIC_ASSERT (sizeof (vl_api_tunnel_encap_decap_flags_t) == sizeof (tunnel_encap_decap_flags_t), "tunnel API and internal flags enum size differ"); +STATIC_ASSERT (sizeof (vl_api_tunnel_flags_t) == sizeof (tunnel_flags_t), + "tunnel API and internal flags enum size differ"); int tunnel_encap_decap_flags_decode (vl_api_tunnel_encap_decap_flags_t f, tunnel_encap_decap_flags_t * o) { - if (f & ~TUNNEL_FLAG_MASK) + if (f & ~TUNNEL_ENCAP_DECAP_FLAG_MASK) /* unknown flags set */ return (VNET_API_ERROR_INVALID_VALUE_2); @@ -45,6 +49,23 @@ tunnel_encap_decap_flags_encode (tunnel_encap_decap_flags_t f) } int +tunnel_flags_decode (vl_api_tunnel_flags_t f, tunnel_flags_t *o) +{ + if (f & ~TUNNEL_FLAG_MASK) + /* unknown flags set */ + return (VNET_API_ERROR_INVALID_VALUE_2); + + *o = (tunnel_flags_t) f; + return (0); +} + +vl_api_tunnel_flags_t +tunnel_flags_encode (tunnel_flags_t f) +{ + return ((vl_api_tunnel_flags_t) f); +} + +int tunnel_mode_decode (vl_api_tunnel_mode_t in, tunnel_mode_t * out) { switch (in) @@ -78,6 +99,65 @@ tunnel_mode_encode (tunnel_mode_t in) return (out); } +int +tunnel_decode (const vl_api_tunnel_t *in, tunnel_t *out) +{ + int rv; + + ip_address_decode2 (&in->src, &out->t_src); + ip_address_decode2 (&in->dst, &out->t_dst); + + if (ip_addr_version (&out->t_src) != ip_addr_version (&out->t_dst)) + return (VNET_API_ERROR_INVALID_PROTOCOL); + + if (0 == ip_address_cmp (&out->t_src, &out->t_dst)) + return (VNET_API_ERROR_SAME_SRC_DST); + + rv = tunnel_encap_decap_flags_decode (in->encap_decap_flags, + &out->t_encap_decap_flags); + + if (rv) + return (rv); + + rv = tunnel_mode_decode (in->mode, &out->t_mode); + + if (rv) + return (rv); + + rv = tunnel_flags_decode (in->flags, &out->t_flags); + + if (rv) + return (rv); + + out->t_table_id = clib_net_to_host_u32 (in->table_id); + out->t_fib_index = fib_table_find ( + ip_address_family_to_fib_proto (ip_addr_version (&out->t_dst)), + out->t_table_id); + + if (~0 == out->t_fib_index) + return (VNET_API_ERROR_NO_SUCH_FIB); + + out->t_dscp = ip_dscp_decode (in->dscp); + out->t_hop_limit = in->hop_limit; + + return (0); +} + +void +tunnel_encode (const tunnel_t *in, vl_api_tunnel_t *out) +{ + ip_address_encode2 (&in->t_src, &out->src); + ip_address_encode2 (&in->t_dst, &out->dst); + + out->encap_decap_flags = + tunnel_encap_decap_flags_encode (in->t_encap_decap_flags); + out->mode = tunnel_mode_encode (in->t_mode); + out->flags = tunnel_flags_encode (in->t_flags); + out->table_id = clib_host_to_net_u32 (in->t_table_id); + out->dscp = ip_dscp_encode (in->t_dscp); + out->hop_limit = in->t_hop_limit; +} + /* * fd.io coding-style-patch-verification: ON * |