X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fbonding%2Fbond_api.c;h=8b8385d82059426f44773d973f5ebeabfafb8247;hb=ea7178631;hp=2395a47fe7a19663cb1d9b341f612dfc22d09bfe;hpb=4c4223edfd46841062340fe449cd97a93dccc498;p=vpp.git

diff --git a/src/vnet/bonding/bond_api.c b/src/vnet/bonding/bond_api.c
index 2395a47fe7a..8b8385d8205 100644
--- a/src/vnet/bonding/bond_api.c
+++ b/src/vnet/bonding/bond_api.c
@@ -46,6 +46,7 @@
 
 #define foreach_bond_api_msg                     \
 _(BOND_CREATE, bond_create)                      \
+_(BOND_CREATE2, bond_create2)			 \
 _(BOND_DELETE, bond_delete)                      \
 _(BOND_ENSLAVE, bond_enslave)                    \
 _(BOND_ADD_MEMBER, bond_add_member)                    \
@@ -102,6 +103,39 @@ vl_api_bond_create_t_handler (vl_api_bond_create_t * mp)
   /* *INDENT-ON* */
 }
 
+static void
+vl_api_bond_create2_t_handler (vl_api_bond_create2_t * mp)
+{
+  vlib_main_t *vm = vlib_get_main ();
+  vl_api_bond_create2_reply_t *rmp;
+  bond_create_if_args_t _a, *ap = &_a;
+
+  clib_memset (ap, 0, sizeof (*ap));
+
+  ap->id = ntohl (mp->id);
+
+  if (mp->use_custom_mac)
+    {
+      mac_address_decode (mp->mac_address, (mac_address_t *) ap->hw_addr);
+      ap->hw_addr_set = 1;
+    }
+
+  ap->mode = ntohl (mp->mode);
+  ap->lb = ntohl (mp->lb);
+  ap->numa_only = mp->numa_only;
+  ap->gso = mp->enable_gso;
+  bond_create_if (vm, ap);
+
+  int rv = ap->rv;
+
+  /* *INDENT-OFF* */
+  REPLY_MACRO2(VL_API_BOND_CREATE2_REPLY,
+  ({
+    rmp->sw_if_index = ntohl (ap->sw_if_index);
+  }));
+  /* *INDENT-ON* */
+}
+
 static void
 vl_api_bond_add_member_t_handler (vl_api_bond_add_member_t * mp)
 {
@@ -113,12 +147,15 @@ vl_api_bond_add_member_t_handler (vl_api_bond_add_member_t * mp)
   clib_memset (ap, 0, sizeof (*ap));
 
   ap->group = ntohl (mp->bond_sw_if_index);
+  VALIDATE_SW_IF_INDEX (mp);
   ap->member = ntohl (mp->sw_if_index);
   ap->is_passive = mp->is_passive;
   ap->is_long_timeout = mp->is_long_timeout;
 
   bond_add_member (vm, ap);
+  rv = ap->rv;
 
+  BAD_SW_IF_INDEX_LABEL;
   REPLY_MACRO (VL_API_BOND_ADD_MEMBER_REPLY);
 }
 
@@ -133,12 +170,15 @@ vl_api_bond_enslave_t_handler (vl_api_bond_enslave_t * mp)
   clib_memset (ap, 0, sizeof (*ap));
 
   ap->group = ntohl (mp->bond_sw_if_index);
+  VALIDATE_SW_IF_INDEX (mp);
   ap->member = ntohl (mp->sw_if_index);
   ap->is_passive = mp->is_passive;
   ap->is_long_timeout = mp->is_long_timeout;
 
   bond_add_member (vm, ap);
+  rv = ap->rv;
 
+  BAD_SW_IF_INDEX_LABEL;
   REPLY_MACRO (VL_API_BOND_ENSLAVE_REPLY);
 }
 
@@ -157,6 +197,7 @@ static void
   ap->weight = ntohl (mp->weight);
 
   bond_set_intf_weight (vm, ap);
+  rv = ap->rv;
 
   REPLY_MACRO (VL_API_SW_INTERFACE_SET_BOND_WEIGHT_REPLY);
 }
@@ -173,6 +214,7 @@ vl_api_bond_detach_slave_t_handler (vl_api_bond_detach_slave_t * mp)
 
   ap->member = ntohl (mp->sw_if_index);
   bond_detach_member (vm, ap);
+  rv = ap->rv;
 
   REPLY_MACRO (VL_API_BOND_DETACH_SLAVE_REPLY);
 }
@@ -189,6 +231,7 @@ vl_api_bond_detach_member_t_handler (vl_api_bond_detach_member_t * mp)
 
   ap->member = ntohl (mp->sw_if_index);
   bond_detach_member (vm, ap);
+  rv = ap->rv;
 
   REPLY_MACRO (VL_API_BOND_DETACH_MEMBER_REPLY);
 }