From 286921eef8aa07e9edd83078c0a8397d06dc448c Mon Sep 17 00:00:00 2001 From: Benoît Ganne Date: Wed, 5 Jun 2019 19:08:40 +0200 Subject: gbp: fix lpm classification with vlan MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fix GBP LPM packet classification in the presence of a VLAN header. Change-Id: I2ff63b34f7475d696b10b5a245ff802bbb1ff01a Signed-off-by: Benoît Ganne --- src/plugins/gbp/gbp_classify_node.c | 62 +++++++------------------------------ 1 file changed, 12 insertions(+), 50 deletions(-) (limited to 'src/plugins/gbp/gbp_classify_node.c') diff --git a/src/plugins/gbp/gbp_classify_node.c b/src/plugins/gbp/gbp_classify_node.c index f7124be84dc..a2d6d4c47ae 100644 --- a/src/plugins/gbp/gbp_classify_node.c +++ b/src/plugins/gbp/gbp_classify_node.c @@ -279,70 +279,32 @@ typedef enum gbp_lpm_classify_next_t_ GPB_LPM_CLASSIFY_DROP, } gbp_lpm_classify_next_t; -always_inline void -gbp_classify_get_src_ip4_address (const ethernet_header_t * eh0, - const ip4_address_t ** ip4) -{ - const ip4_header_t *iph4; - - iph4 = (ip4_header_t *) (eh0 + 1); - *ip4 = &iph4->src_address; -} - -always_inline void -gbp_classify_get_src_ip6_address (const ethernet_header_t * eh0, - const ip6_address_t ** ip6) -{ - const ip6_header_t *iph6; - - iph6 = (ip6_header_t *) (eh0 + 1); - *ip6 = &iph6->src_address; -} - always_inline void gbp_classify_get_src_ip_address (const ethernet_header_t * eh0, const ip4_address_t ** ip4, const ip6_address_t ** ip6) { u16 etype = clib_net_to_host_u16 (eh0->type); + const void *l3h0 = eh0 + 1; + + if (ETHERNET_TYPE_VLAN == etype) + { + const ethernet_vlan_header_t *vh0 = + (ethernet_vlan_header_t *) (eh0 + 1); + etype = clib_net_to_host_u16 (vh0->type); + l3h0 = vh0 + 1; + } switch (etype) { case ETHERNET_TYPE_IP4: - gbp_classify_get_src_ip4_address (eh0, ip4); + *ip4 = &((const ip4_header_t *) l3h0)->src_address; break; case ETHERNET_TYPE_IP6: - gbp_classify_get_src_ip6_address (eh0, ip6); + *ip6 = &((const ip6_header_t *) l3h0)->src_address; break; - case ETHERNET_TYPE_VLAN: - { - ethernet_vlan_header_t *vh0; - - vh0 = (ethernet_vlan_header_t *) (eh0 + 1); - - switch (clib_net_to_host_u16 (vh0->type)) - { - case ETHERNET_TYPE_IP4: - { - gbp_classify_get_src_ip4_address (eh0, ip4); - break; - case ETHERNET_TYPE_IP6: - gbp_classify_get_src_ip6_address (eh0, ip6); - break; - } - } - break; - } case ETHERNET_TYPE_ARP: - { - const ethernet_arp_header_t *ea0; - - ea0 = (ethernet_arp_header_t *) (eh0 + 1); - - *ip4 = &ea0->ip4_over_ethernet[0].ip4; - break; - } - default: + *ip4 = &((ethernet_arp_header_t *) l3h0)->ip4_over_ethernet[0].ip4; break; } } -- cgit 1.2.3-korg