Add reaper functions to want events APIs (VPP-1304)

[vpp.git] / src / vnet / ip / ip6_reassembly.c

diff --git a/src/vnet/ip/ip6_reassembly.c b/src/vnet/ip/ip6_reassembly.c
index c6424a7..ce30d95 100644 (file)
--- a/src/vnet/ip/ip6_reassembly.c
+++ b/src/vnet/ip/ip6_reassembly.c
@@ -437,8 +437,7 @@ always_inline void
 ip6_reass_finalize (vlib_main_t * vm, vlib_node_runtime_t * node,
                    ip6_reass_main_t * rm, ip6_reass_per_thread_t * rt,
                    ip6_reass_t * reass, u32 * bi0, u32 * next0,
-                   vlib_error_t * error0, u32 ** vec_drop_compress,
-                   bool is_feature)
+                   u32 * error0, u32 ** vec_drop_compress, bool is_feature)
 {
   ASSERT (~0 != reass->first_bi);
   *bi0 = reass->first_bi;
@@ -534,6 +533,8 @@ ip6_reass_finalize (vlib_main_t * vm, vlib_node_runtime_t * node,
        reass.next_range_bi;
     }
   while (~0 != sub_chain_bi);
+
+  ASSERT (last_b != NULL);
   last_b->flags &= ~VLIB_BUFFER_NEXT_PRESENT;
   vlib_buffer_t *first_b = vlib_get_buffer (vm, reass->first_bi);
   ASSERT (total_length >= first_b->current_length);
@@ -658,7 +659,7 @@ always_inline void
 ip6_reass_update (vlib_main_t * vm, vlib_node_runtime_t * node,
                  ip6_reass_main_t * rm, ip6_reass_per_thread_t * rt,
                  ip6_reass_t * reass, u32 * bi0, u32 * next0,
-                 vlib_error_t * error0, ip6_frag_hdr_t * frag_hdr,
+                 u32 * error0, ip6_frag_hdr_t * frag_hdr,
                  u32 ** vec_drop_overlap, u32 ** vec_drop_compress,
                  bool is_feature)
 {
@@ -924,10 +925,13 @@ ip6_reassembly_inline (vlib_main_t * vm,
          b0 = vlib_get_buffer (vm, bi0);
 
          ip6_header_t *ip0 = vlib_buffer_get_current (b0);
-         ip6_frag_hdr_t *frag_hdr;
+         ip6_frag_hdr_t *frag_hdr = NULL;
          ip6_ext_header_t *prev_hdr;
-         ip6_ext_header_find_t (ip0, prev_hdr, frag_hdr,
-                                IP_PROTOCOL_IPV6_FRAGMENTATION);
+         if (ip6_ext_hdr (ip0->protocol))
+           {
+             ip6_ext_header_find_t (ip0, prev_hdr, frag_hdr,
+                                    IP_PROTOCOL_IPV6_FRAGMENTATION);
+           }
          if (!frag_hdr)
            {
              // this is a regular packet - no fragmentation
@@ -1144,8 +1148,7 @@ ip6_reass_set (u32 timeout_ms, u32 max_reassemblies,
                             ip6_reass_main.ip6_reass_expire_node_idx,
                             IP6_EVENT_CONFIG_CHANGED, 0);
   u32 new_nbuckets = ip6_reass_get_nbuckets ();
-  if (ip6_reass_main.max_reass_n > 0 && new_nbuckets > 1 &&
-      new_nbuckets != old_nbuckets)
+  if (ip6_reass_main.max_reass_n > 0 && new_nbuckets > old_nbuckets)
     {
       clib_bihash_48_8_t new_hash;
       memset (&new_hash, 0, sizeof (new_hash));
@@ -1204,6 +1207,10 @@ ip6_reass_init_function (vlib_main_t * vm)
   ASSERT (node);
   rm->ip6_reass_expire_node_idx = node->index;
 
+  ip6_reass_set_params (IP6_REASS_TIMEOUT_DEFAULT_MS,
+                       IP6_REASS_MAX_REASSEMBLIES_DEFAULT,
+                       IP6_REASS_EXPIRE_WALK_INTERVAL_DEFAULT_MS);
+
   nbuckets = ip6_reass_get_nbuckets ();
   clib_bihash_init_48_8 (&rm->hash, "ip6-reass", nbuckets, nbuckets * 1024);
 
@@ -1219,10 +1226,6 @@ ip6_reass_init_function (vlib_main_t * vm)
   ip6_register_protocol (IP_PROTOCOL_IPV6_FRAGMENTATION,
                         ip6_reass_node.index);
 
-  ip6_reass_set_params (IP6_REASS_TIMEOUT_DEFAULT_MS,
-                       IP6_REASS_MAX_REASSEMBLIES_DEFAULT,
-                       IP6_REASS_EXPIRE_WALK_INTERVAL_DEFAULT_MS);
-
   return error;
 }