X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fsession%2Fsession_table.h;h=cf4e9698e3ac3260aa0571f413a504d7a1f89c2a;hb=07063b8ea;hp=636ee44a2fe100c43a5972c135186a5d3b4f5351;hpb=c97a7398fc465c480a3ac66cf4b0f91a034ed564;p=vpp.git

diff --git a/src/vnet/session/session_table.h b/src/vnet/session/session_table.h
index 636ee44a2fe..cf4e9698e3a 100644
--- a/src/vnet/session/session_table.h
+++ b/src/vnet/session/session_table.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017 Cisco and/or its affiliates.
+ * Copyright (c) 2017-2019 Cisco and/or its affiliates.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at:
@@ -37,7 +37,7 @@ typedef struct _session_lookup_table
   /**
    * Per fib proto and transport proto session rules tables
    */
-  session_rules_table_t session_rules[TRANSPORT_N_PROTO];
+  session_rules_table_t *session_rules;
 
   /** Flag that indicates if table has local scope */
   u8 is_local;
@@ -49,17 +49,17 @@ typedef struct _session_lookup_table
    * byproduct of fib table ids not necessarily being the same for
    * identical fib idices of v4 and v6 fib protos */
   u8 active_fib_proto;
+  /* Required for pool_get_aligned(...) */
+    CLIB_CACHE_LINE_ALIGN_MARK (cacheline0);
 } session_table_t;
 
 #define SESSION_TABLE_INVALID_INDEX ((u32)~0)
 #define SESSION_LOCAL_TABLE_PREFIX ((u32)~0)
-#define SESSION_INVALID_INDEX ((u32)~0)
-#define SESSION_INVALID_HANDLE ((u64)~0)
+#define SESSION_DROP_HANDLE (((u64)~0) - 1)
 
 typedef int (*ip4_session_table_walk_fn_t) (clib_bihash_kv_16_8_t * kvp,
 					    void *ctx);
 
-void ip4_session_table_walk_cb (clib_bihash_kv_16_8_t * kvp, void *arg);
 void ip4_session_table_walk (clib_bihash_16_8_t * hash,
 			     ip4_session_table_walk_fn_t fn, void *arg);