Merge "Do not consider evicted flows as active flow in flow utility"

Juniper · Feb 24, 2016 · bc92292 · bc92292
2 parents 2cfdf83 + 412a41d
commit bc92292
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/utils/flow.c b/utils/flow.c
@@ -599,6 +599,9 @@ flow_stats(void)
             fe = (struct vr_flow_entry *)((char *)ft->ft_entries +
                                           (i * sizeof(*fe)));
             if (fe->fe_flags & VR_FLOW_FLAG_ACTIVE) {
+                if (fe->fe_flags & VR_FLOW_FLAG_EVICTED) {
+                    continue;
+                }
                 total_entries++;
                 if (fe->fe_action != VR_FLOW_ACTION_HOLD) {
                     active_entries++;
@@ -706,6 +709,9 @@ flow_rate(void)
         for (i = 0; i < ft->ft_num_entries; i++) {
             fe = (struct vr_flow_entry *)((char *)ft->ft_entries + (i * sizeof(*fe)));
             if (fe->fe_flags & VR_FLOW_FLAG_ACTIVE) {
+                if (fe->fe_flags & VR_FLOW_FLAG_EVICTED) {
+                    continue;
+                }
                 total_entries++;
                 if (fe->fe_action != VR_FLOW_ACTION_HOLD)
                     active_entries++;