session: api to add new transport types

[vpp.git] / src / vnet / bonding / cli.c

diff --git a/src/vnet/bonding/cli.c b/src/vnet/bonding/cli.c
index 554ffe9..66aaa2e 100644 (file)
--- a/src/vnet/bonding/cli.c
+++ b/src/vnet/bonding/cli.c
@@ -63,10 +63,6 @@ bond_disable_collecting_distributing (vlib_main_t * vm, slave_if_t * sif)
     vlib_process_signal_event (bm->vlib_main, bond_process_node.index,
                               BOND_SEND_GARP_NA, bif->hw_if_index);
   clib_spinlock_unlock_if_init (&bif->lockp);
-
-  if (bif->mode == BOND_MODE_LACP)
-    stat_segment_set_state_counter (bm->stats[bif->sw_if_index]
-                                   [sif->sw_if_index], sif->actor.state);
 }
 
 /*
@@ -82,8 +78,8 @@ bond_slave_sort (void *a1, void *a2)
   slave_if_t *sif2 = bond_get_slave_by_sw_if_index (*s2);
   bond_if_t *bif;
 
-  ASSERT (sif1);
-  ASSERT (sif2);
+  ALWAYS_ASSERT (sif1);
+  ALWAYS_ASSERT (sif2);
   /*
    * sort entries according to preference rules:
    * 1. biggest weight
@@ -175,10 +171,6 @@ bond_enable_collecting_distributing (vlib_main_t * vm, slave_if_t * sif)
 
 done:
   clib_spinlock_unlock_if_init (&bif->lockp);
-
-  if (bif->mode == BOND_MODE_LACP)
-    stat_segment_set_state_counter (bm->stats[bif->sw_if_index]
-                                   [sif->sw_if_index], sif->actor.state);
 }
 
 int
@@ -329,8 +321,12 @@ bond_delete_neighbor (vlib_main_t * vm, bond_if_t * bif, slave_if_t * sif)
     (*bm->lacp_enable_disable) (vm, bif, sif, 0);
 
   if (bif->mode == BOND_MODE_LACP)
-    stat_segment_deregister_state_counter
-      (bm->stats[bif->sw_if_index][sif->sw_if_index]);
+    {
+      stat_segment_deregister_state_counter
+       (bm->stats[bif->sw_if_index][sif->sw_if_index].actor_state);
+      stat_segment_deregister_state_counter
+       (bm->stats[bif->sw_if_index][sif->sw_if_index].partner_state);
+    }
 
   pool_put (bm->neighbors, sif);
 }
@@ -628,7 +624,19 @@ bond_enslave (vlib_main_t * vm, bond_enslave_args_t * args)
       vec_validate (bm->stats[bif->sw_if_index], args->slave);
 
       args->error = stat_segment_register_state_counter
-       (name, &bm->stats[bif->sw_if_index][args->slave]);
+       (name, &bm->stats[bif->sw_if_index][args->slave].actor_state);
+      if (args->error != 0)
+       {
+         args->rv = VNET_API_ERROR_INVALID_INTERFACE;
+         vec_free (name);
+         return;
+       }
+
+      vec_reset_length (name);
+      name = format (0, "/if/lacp/%u/%u/partner-state%c", bif->sw_if_index,
+                    args->slave, 0);
+      args->error = stat_segment_register_state_counter
+       (name, &bm->stats[bif->sw_if_index][args->slave].partner_state);
       vec_free (name);
       if (args->error != 0)
        {