X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fbonding%2Fbond_api.c;h=525f058ee4cb60d10830806d3be6a06169369490;hb=refs%2Fchanges%2F36%2F26336%2F5;hp=958e594a4b13a46e378bd2dfbc9ca1e5afd25c11;hpb=e63325e3ca03c847963863446345e6c80a2c0cfd;p=vpp.git diff --git a/src/vnet/bonding/bond_api.c b/src/vnet/bonding/bond_api.c index 958e594a4b1..525f058ee4c 100644 --- a/src/vnet/bonding/bond_api.c +++ b/src/vnet/bonding/bond_api.c @@ -23,6 +23,7 @@ #include #include #include +#include #include @@ -47,52 +48,22 @@ _(BOND_CREATE, bond_create) \ _(BOND_DELETE, bond_delete) \ _(BOND_ENSLAVE, bond_enslave) \ +_(SW_INTERFACE_SET_BOND_WEIGHT, sw_interface_set_bond_weight) \ _(BOND_DETACH_SLAVE, bond_detach_slave) \ _(SW_INTERFACE_BOND_DUMP, sw_interface_bond_dump)\ _(SW_INTERFACE_SLAVE_DUMP, sw_interface_slave_dump) -static void -bond_send_sw_interface_event_deleted (vpe_api_main_t * am, - unix_shared_memory_queue_t * q, - u32 sw_if_index) -{ - vl_api_sw_interface_event_t *mp; - - mp = vl_msg_api_alloc (sizeof (*mp)); - clib_memset (mp, 0, sizeof (*mp)); - mp->_vl_msg_id = ntohs (VL_API_SW_INTERFACE_EVENT); - mp->sw_if_index = ntohl (sw_if_index); - - mp->flags = 0; - mp->deleted = 1; - vl_msg_api_send_shmem (q, (u8 *) & mp); -} - static void vl_api_bond_delete_t_handler (vl_api_bond_delete_t * mp) { vlib_main_t *vm = vlib_get_main (); int rv; - vpe_api_main_t *vam = &vpe_api_main; vl_api_bond_delete_reply_t *rmp; - unix_shared_memory_queue_t *q; u32 sw_if_index = ntohl (mp->sw_if_index); rv = bond_delete_if (vm, sw_if_index); - q = vl_api_client_index_to_input_queue (mp->client_index); - if (!q) - return; - - rmp = vl_msg_api_alloc (sizeof (*rmp)); - rmp->_vl_msg_id = ntohs (VL_API_BOND_DELETE_REPLY); - rmp->context = mp->context; - rmp->retval = ntohl (rv); - - vl_msg_api_send_shmem (q, (u8 *) & rmp); - - if (!rv) - bond_send_sw_interface_event_deleted (vam, q, sw_if_index); + REPLY_MACRO (VL_API_BOND_DELETE_REPLY); } static void @@ -100,7 +71,6 @@ vl_api_bond_create_t_handler (vl_api_bond_create_t * mp) { vlib_main_t *vm = vlib_get_main (); vl_api_bond_create_reply_t *rmp; - unix_shared_memory_queue_t *q; bond_create_if_args_t _a, *ap = &_a; clib_memset (ap, 0, sizeof (*ap)); @@ -109,27 +79,23 @@ vl_api_bond_create_t_handler (vl_api_bond_create_t * mp) if (mp->use_custom_mac) { - clib_memcpy (ap->hw_addr, mp->mac_address, 6); + mac_address_decode (mp->mac_address, (mac_address_t *) ap->hw_addr); ap->hw_addr_set = 1; } - ap->mode = mp->mode; - ap->lb = mp->lb; + ap->mode = ntohl (mp->mode); + ap->lb = ntohl (mp->lb); + ap->numa_only = mp->numa_only; bond_create_if (vm, ap); - q = vl_api_client_index_to_input_queue (mp->client_index); - if (!q) - return; + int rv = ap->rv; - if (ap->rv != 0) - return; - rmp = vl_msg_api_alloc (sizeof (*rmp)); - rmp->_vl_msg_id = ntohs (VL_API_BOND_CREATE_REPLY); - rmp->context = mp->context; - rmp->retval = ntohl (ap->rv); - rmp->sw_if_index = ntohl (ap->sw_if_index); - - vl_msg_api_send_shmem (q, (u8 *) & rmp); + /* *INDENT-OFF* */ + REPLY_MACRO2(VL_API_BOND_CREATE_REPLY, + ({ + rmp->sw_if_index = ntohl (ap->sw_if_index); + })); + /* *INDENT-ON* */ } static void @@ -137,8 +103,8 @@ vl_api_bond_enslave_t_handler (vl_api_bond_enslave_t * mp) { vlib_main_t *vm = vlib_get_main (); vl_api_bond_enslave_reply_t *rmp; - unix_shared_memory_queue_t *q; bond_enslave_args_t _a, *ap = &_a; + int rv = 0; clib_memset (ap, 0, sizeof (*ap)); @@ -149,16 +115,26 @@ vl_api_bond_enslave_t_handler (vl_api_bond_enslave_t * mp) bond_enslave (vm, ap); - q = vl_api_client_index_to_input_queue (mp->client_index); - if (!q) - return; + REPLY_MACRO (VL_API_BOND_ENSLAVE_REPLY); +} - rmp = vl_msg_api_alloc (sizeof (*rmp)); - rmp->_vl_msg_id = ntohs (VL_API_BOND_ENSLAVE_REPLY); - rmp->context = mp->context; - rmp->retval = ntohl (ap->rv); +static void + vl_api_sw_interface_set_bond_weight_t_handler + (vl_api_sw_interface_set_bond_weight_t * mp) +{ + vlib_main_t *vm = vlib_get_main (); + bond_set_intf_weight_args_t _a, *ap = &_a; + vl_api_sw_interface_set_bond_weight_reply_t *rmp; + int rv = 0; - vl_msg_api_send_shmem (q, (u8 *) & rmp); + clib_memset (ap, 0, sizeof (*ap)); + + ap->sw_if_index = ntohl (mp->sw_if_index); + ap->weight = ntohl (mp->weight); + + bond_set_intf_weight (vm, ap); + + REPLY_MACRO (VL_API_SW_INTERFACE_SET_BOND_WEIGHT_REPLY); } static void @@ -166,24 +142,15 @@ vl_api_bond_detach_slave_t_handler (vl_api_bond_detach_slave_t * mp) { vlib_main_t *vm = vlib_get_main (); vl_api_bond_detach_slave_reply_t *rmp; - unix_shared_memory_queue_t *q; bond_detach_slave_args_t _a, *ap = &_a; + int rv = 0; clib_memset (ap, 0, sizeof (*ap)); ap->slave = ntohl (mp->sw_if_index); bond_detach_slave (vm, ap); - q = vl_api_client_index_to_input_queue (mp->client_index); - if (!q) - return; - - rmp = vl_msg_api_alloc (sizeof (*rmp)); - rmp->_vl_msg_id = ntohs (VL_API_BOND_DETACH_SLAVE_REPLY); - rmp->context = mp->context; - rmp->retval = htonl (ap->rv); - - vl_msg_api_send_shmem (q, (u8 *) & rmp); + REPLY_MACRO (VL_API_BOND_DETACH_SLAVE_REPLY); } static void @@ -202,8 +169,9 @@ bond_send_sw_interface_details (vpe_api_main_t * am, clib_memcpy (mp->interface_name, bond_if->interface_name, MIN (ARRAY_LEN (mp->interface_name) - 1, strlen ((const char *) bond_if->interface_name))); - mp->mode = bond_if->mode; - mp->lb = bond_if->lb; + mp->mode = htonl (bond_if->mode); + mp->lb = htonl (bond_if->lb); + mp->numa_only = bond_if->numa_only; mp->active_slaves = htonl (bond_if->active_slaves); mp->slaves = htonl (bond_if->slaves); @@ -253,6 +221,8 @@ bond_send_sw_interface_slave_details (vpe_api_main_t * am, strlen ((const char *) slave_if->interface_name))); mp->is_passive = slave_if->is_passive; mp->is_long_timeout = slave_if->is_long_timeout; + mp->is_local_numa = slave_if->is_local_numa; + mp->weight = htonl (slave_if->weight); mp->context = context; vl_api_send_msg (reg, (u8 *) mp); @@ -299,7 +269,7 @@ bond_setup_message_id_table (api_main_t * am) static clib_error_t * bond_api_hookup (vlib_main_t * vm) { - api_main_t *am = &api_main; + api_main_t *am = vlibapi_get_main (); #define _(N,n) \ vl_msg_api_set_handlers(VL_API_##N, #n, \