ip: reassembly - fixing stepping index in a better way

Type: fix

pool_is_free_index() check is performed only for the first element

Signed-off-by: Vijayabhaskar Katamreddy <vkatamre@cisco.com>
Change-Id: Icadc715a9b54761ec69805a134a69a262137536d

diff --git a/src/vnet/ip/reass/ip4_full_reass.c b/src/vnet/ip/reass/ip4_full_reass.c
index 1ac2261..becfc46 100644 (file)
--- a/src/vnet/ip/reass/ip4_full_reass.c
+++ b/src/vnet/ip/reass/ip4_full_reass.c
@@ -1724,14 +1724,14 @@ ip4_full_reass_walk_expired (vlib_main_t *vm, vlib_node_runtime_t *node,
              rt->last_id = end;
            }
 
-         pool_foreach_stepping_index (
-           index, beg, end, rt->pool, ({
-             reass = pool_elt_at_index (rt->pool, index);
-             if (now > reass->last_heard + rm->timeout)
-               {
-                 vec_add1 (pool_indexes_to_free, index);
-               }
-           }));
+         pool_foreach_stepping_index (index, beg, end, rt->pool)
+         {
+           reass = pool_elt_at_index (rt->pool, index);
+           if (now > reass->last_heard + rm->timeout)
+             {
+               vec_add1 (pool_indexes_to_free, index);
+             }
+         }
 
          if (vec_len (pool_indexes_to_free))
            vlib_node_increment_counter (vm, node->node_index,

diff --git a/src/vppinfra/pool.h b/src/vppinfra/pool.h
index dd581ef..ef81609 100644 (file)
--- a/src/vppinfra/pool.h
+++ b/src/vppinfra/pool.h
@@ -561,16 +561,11 @@ do {                                                                      \
         i = pool_get_next_index (v, i))
 
 /* Iterate pool by index from s to e */
-#define pool_foreach_stepping_index(i, s, e, v, body)                         \
-  for ((i) = (s); (i) < (e); (i) = pool_get_next_index (v, i))                \
-    {                                                                         \
-      if (!pool_is_free_index ((v), (i)))                                     \
-       do                                                                    \
-         {                                                                   \
-           body;                                                             \
-         }                                                                   \
-       while (0);                                                            \
-    }
+#define pool_foreach_stepping_index(i, s, e, v)                               \
+  for ((i) =                                                                  \
+        (pool_is_free_index ((v), (s)) ? pool_get_next_index ((v), (s)) :    \
+                                               (s));                               \
+       (i) < (e); (i) = pool_get_next_index ((v), (i)))
 
 /**
  * @brief Remove all elements from a pool in a safe way