From 9534696b4637185c9f296375e63c50d8976d153d Mon Sep 17 00:00:00 2001 From: Neale Ranns Date: Mon, 25 Nov 2019 13:04:44 +0000 Subject: ipip: Tunnel flags controlling copying data to/from payload/encap Type: feature Signed-off-by: Neale Ranns Change-Id: I9467f11775936754406892b8e9e275f989ac9b30 --- src/vnet/ipip/ipip_api.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'src/vnet/ipip/ipip_api.c') diff --git a/src/vnet/ipip/ipip_api.c b/src/vnet/ipip/ipip_api.c index da0cb169296..47ff159b703 100644 --- a/src/vnet/ipip/ipip_api.c +++ b/src/vnet/ipip/ipip_api.c @@ -22,6 +22,7 @@ #include #include #include +#include #include #include @@ -36,6 +37,7 @@ vl_api_ipip_add_tunnel_t_handler (vl_api_ipip_add_tunnel_t * mp) vl_api_ipip_add_tunnel_reply_t *rmp; int rv = 0; u32 fib_index, sw_if_index = ~0; + ipip_tunnel_flags_t flags; ip46_address_t src, dst; ip46_type_t itype[2]; @@ -54,6 +56,11 @@ vl_api_ipip_add_tunnel_t_handler (vl_api_ipip_add_tunnel_t * mp) goto out; } + rv = ipip_tunnel_flags_decode (mp->tunnel.flags, &flags); + + if (rv) + goto out; + fib_index = fib_table_find (fib_proto_from_ip46 (itype[0]), ntohl (mp->tunnel.table_id)); @@ -67,7 +74,8 @@ vl_api_ipip_add_tunnel_t_handler (vl_api_ipip_add_tunnel_t * mp) IPIP_TRANSPORT_IP6 : IPIP_TRANSPORT_IP4), ntohl (mp->tunnel.instance), &src, &dst, - fib_index, mp->tunnel.tc_tos, &sw_if_index); + fib_index, flags, + ip_dscp_decode (mp->tunnel.dscp), &sw_if_index); } out: @@ -110,6 +118,8 @@ send_ipip_tunnel_details (ipip_tunnel_t * t, vl_api_ipip_tunnel_dump_t * mp) rmp->tunnel.table_id = htonl (ft->ft_table_id); rmp->tunnel.instance = htonl (t->user_instance); rmp->tunnel.sw_if_index = htonl (t->sw_if_index); + rmp->tunnel.dscp = ip_dscp_encode(t->dscp); + rmp->tunnel.flags = ipip_tunnel_flags_encode(t->flags); })); /* *INDENT-ON* */ } -- cgit 1.2.3-korg