IPv6 HBH: Refactor code. Separate out RFC2460 HBH handling and the more experimental

[vpp.git] / vnet / vnet / ip / lookup.h

diff --git a/vnet/vnet/ip/lookup.h b/vnet/vnet/ip/lookup.h
index 62de210..30c1291 100644 (file)
--- a/vnet/vnet/ip/lookup.h
+++ b/vnet/vnet/ip/lookup.h
@@ -79,11 +79,16 @@ typedef enum {
   /* This packets needs to go to 6RD (RFC5969) */
   IP_LOOKUP_NEXT_SIXRD,
 
+  /* 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;
 
@@ -101,6 +106,8 @@ typedef enum {
     [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",            \
 }
 
 #define IP6_LOOKUP_NEXT_NODES {                                        \
@@ -117,6 +124,8 @@ typedef enum {
     [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",            \
 }
 
 /* Flow hash configuration */
@@ -170,12 +179,15 @@ typedef struct {
     /* IP_LOOKUP_NEXT_ARP only */
     struct {
       ip46_address_t next_hop;
-      u32 next_adj_index_with_same_next_hop;
     } arp;
     /* IP_LOOKUP_NEXT_CLASSIFY only */
     struct {
       u16 table_index;
     } classify;
+    /* IP_LOOKUP_NEXT_INDIRECT only */
+    struct {
+        ip46_address_t next_hop;
+    } indirect;
   };
 
   STRUCT_MARK(signature_end);
@@ -463,9 +475,13 @@ ip_update_adjacency (ip_lookup_main_t * lm,
 static inline int
 ip_adjacency_is_multipath(ip_lookup_main_t * lm, u32 adj_index)
 {
+  if (!vec_len(lm->multipath_adjacencies))
+    return 0;
+
   if (vec_len(lm->multipath_adjacencies) < adj_index - 1)
     return 0;
 
+
   return (lm->multipath_adjacencies[adj_index].adj_index == adj_index &&
          lm->multipath_adjacencies[adj_index].n_adj_in_block > 0);
 }