diff options
| author |   Ole Troan <ot@cisco.com> | 2016-06-14 21:12:32 +0200 |
|---|---|---|
| committer |   Dave Barach <openvpp@barachs.net> | 2016-06-16 18:05:51 +0000 |
| commit | f0f852251c885fc5f73125a4365cf356feeb0cdd (patch) | |
| tree | 27174d12213ccc53fb9bf2a85b9643eb93e5d7df /vnet/vnet/ip/lookup.h | |
| parent | 81f7092d34d9ce2c674fb0ff7683188231d1b773 (diff) | |
VPP-19: Split the lookup.h IP_LOOKUP_NEXT enum.
IP4 and IP6 nodes currently shares the adj->lookup_next_index. That
has some issues, e.g. that one has to add non-functional nodes like
ip4-hop-by-hop and that anyone dynamically adding nodes to any of the
IP4/IP6 lookup nodes must ensure they add themselves to all relevant
nodes to ensure next index consistency.
This patch splits the IP_LOOKUP_NEXT into separate enums for IP4 and
IP6 with a common part for next-nodes used by both. It sets up other
IP nodes as siblings to avoid inconsistencies. This allows IP4 and IP6
lookup next nodes to evolve independently. The adj->lookup_next_index is
still shared, assuming that an IP4 adjacency isn't used by an
IP6 graph node.
Change-Id: I589b8364fe54e7a10c059b7ef9d6707eb0a345cc
Signed-off-by: Ole Troan <ot@cisco.com>
Diffstat (limited to 'vnet/vnet/ip/lookup.h')
| -rw-r--r-- | vnet/vnet/ip/lookup.h | 28 |
1 files changed, 16 insertions, 12 deletions
diff --git a/vnet/vnet/ip/lookup.h b/vnet/vnet/ip/lookup.h index 30c12914460..a7aef9f52a8 100644 --- a/vnet/vnet/ip/lookup.h +++ b/vnet/vnet/ip/lookup.h @@ -45,7 +45,7 @@ #include <vnet/ip/ip4_packet.h> #include <vnet/ip/ip6_packet.h> -/* Next index stored in adjacency. */ +/* Common (IP4/IP6) next index stored in adjacency. */ typedef enum { /* Packet does not match any route in table. */ IP_LOOKUP_NEXT_MISS, @@ -82,16 +82,23 @@ typedef enum { /* This packets needs to go to indirect next hop */ IP_LOOKUP_NEXT_INDIRECT, - /* Hop-by-hop header handling */ - IP_LOOKUP_NEXT_HOP_BY_HOP, - IP_LOOKUP_NEXT_ADD_HOP_BY_HOP, - IP_LOOKUP_NEXT_POP_HOP_BY_HOP, - IP_LOOKUP_NEXT_ICMP_ERROR, IP_LOOKUP_N_NEXT, } ip_lookup_next_t; +typedef enum { + IP4_LOOKUP_N_NEXT = IP_LOOKUP_N_NEXT, +} ip4_lookup_next_t; + +typedef enum { + /* Hop-by-hop header handling */ + IP6_LOOKUP_NEXT_HOP_BY_HOP = IP_LOOKUP_N_NEXT, + IP6_LOOKUP_NEXT_ADD_HOP_BY_HOP, + IP6_LOOKUP_NEXT_POP_HOP_BY_HOP, + IP6_LOOKUP_N_NEXT, +} ip6_lookup_next_t; + #define IP4_LOOKUP_NEXT_NODES { \ [IP_LOOKUP_NEXT_MISS] = "ip4-miss", \ [IP_LOOKUP_NEXT_DROP] = "ip4-drop", \ @@ -103,9 +110,6 @@ typedef enum { [IP_LOOKUP_NEXT_MAP] = "ip4-map", \ [IP_LOOKUP_NEXT_MAP_T] = "ip4-map-t", \ [IP_LOOKUP_NEXT_SIXRD] = "ip4-sixrd", \ - [IP_LOOKUP_NEXT_HOP_BY_HOP] = "ip4-hop-by-hop", \ - [IP_LOOKUP_NEXT_ADD_HOP_BY_HOP] = "ip4-add-hop-by-hop", \ - [IP_LOOKUP_NEXT_POP_HOP_BY_HOP] = "ip4-pop-hop-by-hop", \ [IP_LOOKUP_NEXT_INDIRECT] = "ip4-indirect", \ [IP_LOOKUP_NEXT_ICMP_ERROR] = "ip4-icmp-error", \ } @@ -121,11 +125,11 @@ typedef enum { [IP_LOOKUP_NEXT_MAP] = "ip6-map", \ [IP_LOOKUP_NEXT_MAP_T] = "ip6-map-t", \ [IP_LOOKUP_NEXT_SIXRD] = "ip6-sixrd", \ - [IP_LOOKUP_NEXT_HOP_BY_HOP] = "ip6-hop-by-hop", \ - [IP_LOOKUP_NEXT_ADD_HOP_BY_HOP] = "ip6-add-hop-by-hop", \ - [IP_LOOKUP_NEXT_POP_HOP_BY_HOP] = "ip6-pop-hop-by-hop", \ [IP_LOOKUP_NEXT_INDIRECT] = "ip6-indirect", \ [IP_LOOKUP_NEXT_ICMP_ERROR] = "ip6-icmp-error", \ + [IP6_LOOKUP_NEXT_HOP_BY_HOP] = "ip6-hop-by-hop", \ + [IP6_LOOKUP_NEXT_ADD_HOP_BY_HOP] = "ip6-add-hop-by-hop", \ + [IP6_LOOKUP_NEXT_POP_HOP_BY_HOP] = "ip6-pop-hop-by-hop", \ } /* Flow hash configuration */ |