From 2646c80db8d3d1a3cd7555328d5a0038798f861e Mon Sep 17 00:00:00 2001 From: Neale Ranns Date: Wed, 19 Sep 2018 04:55:32 -0700 Subject: GRE: fix 4o6 and 6o4 adj stacking Change-Id: I13dc5eab8835c4f3b95906816d42dccfeee8b092 Signed-off-by: Neale Ranns --- src/vnet/fib/fib_types.c | 16 ++++++++++++++++ src/vnet/fib/fib_types.h | 5 +++++ 2 files changed, 21 insertions(+) (limited to 'src/vnet/fib') diff --git a/src/vnet/fib/fib_types.c b/src/vnet/fib/fib_types.c index a71f4194a18..25606438491 100644 --- a/src/vnet/fib/fib_types.c +++ b/src/vnet/fib/fib_types.c @@ -339,6 +339,22 @@ fib_forw_chain_type_from_dpo_proto (dpo_proto_t proto) return (FIB_FORW_CHAIN_TYPE_UNICAST_IP4); } +fib_forward_chain_type_t +fib_forw_chain_type_from_fib_proto (fib_protocol_t proto) +{ + switch (proto) + { + case FIB_PROTOCOL_IP4: + return (FIB_FORW_CHAIN_TYPE_UNICAST_IP4); + case FIB_PROTOCOL_IP6: + return (FIB_FORW_CHAIN_TYPE_UNICAST_IP6); + case FIB_PROTOCOL_MPLS: + return (FIB_FORW_CHAIN_TYPE_MPLS_NON_EOS); + } + ASSERT(0); + return (FIB_FORW_CHAIN_TYPE_UNICAST_IP4); +} + vnet_link_t fib_forw_chain_type_to_link_type (fib_forward_chain_type_t fct) { diff --git a/src/vnet/fib/fib_types.h b/src/vnet/fib/fib_types.h index 805f8e1b964..cd6ef7efac8 100644 --- a/src/vnet/fib/fib_types.h +++ b/src/vnet/fib/fib_types.h @@ -187,6 +187,11 @@ extern fib_forward_chain_type_t fib_forw_chain_type_from_link_type(vnet_link_t l */ extern fib_forward_chain_type_t fib_forw_chain_type_from_dpo_proto(dpo_proto_t proto); +/** + * @brief Convert from a fib-protocol to a chain type. + */ +extern fib_forward_chain_type_t fib_forw_chain_type_from_fib_proto(fib_protocol_t proto); + /** * @brief Convert from a chain type to the DPO proto it will install */ -- cgit 1.2.3-korg