Merge "[HICN-169] Fixed counters that were decrementing or negative."

4 files changed, 25 insertions, 21 deletions

diff --git a/hicn-plugin/src/data_fwd_node.c b/hicn-plugin/src/data_fwd_node.c
index 53308a49d..ca3baaa0d 100644
--- a/hicn-plugin/src/data_fwd_node.c
+++ b/hicn-plugin/src/data_fwd_node.c
@@ -176,6 +176,7 @@ hicn_data_node_fn (vlib_main_t * vm, vlib_node_runtime_t * node,
 	      hicn_pcs_delete (pitcs, &pitp, &node0, vm, hash_entry0,
 			       dpo_vft0, &hicn_dpo_id0);
 
+#if HICN_FEATURE_CS
 	      if (hicnb0->flags & HICN_BUFFER_FLAGS_FACE_IS_APP)
 		{
 		  push_in_cache (vm, bi0, &n_left_to_next, &next0, &to_next,
@@ -186,6 +187,10 @@ hicn_data_node_fn (vlib_main_t * vm, vlib_node_runtime_t * node,
 		  drop_packet (vm, bi0, &n_left_to_next, &next0, &to_next,
 			       &next_index, node);
 		}
+#else
+              drop_packet (vm, bi0, &n_left_to_next, &next0, &to_next,
+                           &next_index, node);
+#endif
 	      stats.pit_expired_count++;
 
 	      if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE) &&
diff --git a/hicn-plugin/src/data_pcslookup_node.c b/hicn-plugin/src/data_pcslookup_node.c
index aeb8c2276..fdf855e57 100644
--- a/hicn-plugin/src/data_pcslookup_node.c
+++ b/hicn-plugin/src/data_pcslookup_node.c
@@ -102,27 +102,17 @@ hicn_data_pcslookup_node_fn (vlib_main_t * vm, vlib_node_runtime_t * node,
 
 	  b0 = vlib_get_buffer (vm, bi0);
 	  hb0 = hicn_get_buffer (b0);
+          next0 = HICN_DATA_PCSLOOKUP_NEXT_ERROR_DROP;
 
 	  /* Incr packet counter */
 	  stats.pkts_processed += 1;
 
 	  ret0 = hicn_data_parse_pkt (b0, &name, &namelen, &hicn0, &isv6);
-
-	  if (PREDICT_TRUE (ret0 == HICN_ERROR_NONE))
-	    {
-	      next0 =
-		isv6 ? HICN_DATA_PCSLOOKUP_NEXT_V6_LOOKUP :
-		HICN_DATA_PCSLOOKUP_NEXT_V4_LOOKUP;
-	    }
 	  nameptr = (u8 *) (&name);
-	  if (PREDICT_FALSE
-	      (ret0 != HICN_ERROR_NONE
-	       || hicn_hashtb_fullhash (nameptr, namelen,
-					&name_hash) != HICN_ERROR_NONE))
-	    {
-	      next0 = HICN_DATA_PCSLOOKUP_NEXT_ERROR_DROP;
-	    }
-	  else
+
+	  if (PREDICT_TRUE (ret0 == HICN_ERROR_NONE &&
+                            hicn_hashtb_fullhash (nameptr, namelen,
+                                                  &name_hash) == HICN_ERROR_NONE))
 	    {
 	      int res =
 		hicn_hashtb_lookup_node (rt->pitcs->pcs_table, nameptr,
@@ -137,9 +127,10 @@ hicn_data_pcslookup_node_fn (vlib_main_t * vm, vlib_node_runtime_t * node,
 
 	      stats.pkts_data_count += 1;
 
+#if HICN_FEATURE_CS
 	      if ((res == HICN_ERROR_HASHTB_HASH_NOT_FOUND
 		   || (res == HICN_ERROR_NONE && is_cs0))
-		  && (hb0->flags & HICN_BUFFER_FLAGS_FACE_IS_APP))
+		  && ((hb0->flags & HICN_BUFFER_FLAGS_FACE_IS_APP)))
 		{
 		  next0 = HICN_DATA_PCSLOOKUP_NEXT_STORE_DATA;
 		}
@@ -153,6 +144,18 @@ hicn_data_pcslookup_node_fn (vlib_main_t * vm, vlib_node_runtime_t * node,
 		  next0 = HICN_DATA_PCSLOOKUP_NEXT_DATA_FWD + is_cs0;
 		}
 	    }
+#else
+	      if (res == HICN_ERROR_NONE)
+		{
+		  /*
+		   * In case the result of the lookup
+		   * is a CS entry, the packet is
+		   * dropped
+		   */
+		  next0 = HICN_DATA_PCSLOOKUP_NEXT_DATA_FWD + is_cs0;
+		}
+	    }
+#endif
 
 	  hicn_store_internal_state (b0, name_hash, node_id0, dpo_ctx_id0,
 				     vft_id0, hash_entry_id, bucket_id,
diff --git a/hicn-plugin/src/mgmt.c b/hicn-plugin/src/mgmt.c
index b992ba15c..cfeef6cb6 100644
--- a/hicn-plugin/src/mgmt.c
+++ b/hicn-plugin/src/mgmt.c
@@ -66,10 +66,6 @@ hicn_mgmt_node_stats_get (vl_api_hicn_api_node_stats_get_reply_t * rmp)
 		       rmp->pkts_processed +=
 		       clib_host_to_net_u64 (em->counters[node_cntr_base_idx +
 							  HICNFWD_ERROR_PROCESSED]);
-		       n =
-		       vlib_get_node (this_vlib_main,
-				      hicn_data_pcslookup_node.index);
-		       node_cntr_base_idx = n->error_heap_index;
 		       rmp->pkts_data_count +=
 		       clib_host_to_net_u64 (em->counters[node_cntr_base_idx +
 							  HICNFWD_ERROR_DATAS]);
diff --git a/hicn-plugin/src/pcs.h b/hicn-plugin/src/pcs.h
index 28f9c3c37..c7e8a4b59 100644
--- a/hicn-plugin/src/pcs.h
+++ b/hicn-plugin/src/pcs.h
@@ -685,9 +685,9 @@ hicn_pcs_pit_delete (hicn_pit_cs_t * pitcs, hicn_pcs_entry_t ** pcs_entryp,
 		     const hicn_dpo_vft_t * dpo_vft, dpo_id_t * hicn_dpo_id)
 {
   hash_entry->locks--;
-  pitcs->pcs_pit_count--;
   if (hash_entry->locks == 0)
     {
+      pitcs->pcs_pit_count--;
       hicn_pcs_delete_internal
 	(pitcs, pcs_entryp, hash_entry, node, vm, dpo_vft, hicn_dpo_id);
     }