struct msghdr h;
word n_bytes, n_bytes_tx, n_retries;
- memset (&h, 0, sizeof (h));
+ clib_memset (&h, 0, sizeof (h));
h.msg_name = tx_addr;
h.msg_namelen = sizeof (tx_addr[0]);
n_bytes = append_buffer_index_to_iovec (vm, buffer_index, &msm->iovecs);
ASSERT (n_bytes <= msm->mc_main.transport.max_packet_size);
if (n_bytes > msm->mc_main.transport.max_packet_size)
- clib_error ("sending packet larger than interace MTU %d bytes", n_bytes);
+ clib_error ("sending packet larger than interface MTU %d bytes", n_bytes);
h.msg_iov = msm->iovecs;
h.msg_iovlen = vec_len (msm->iovecs);
vlib_main_t *vm = msm->mc_main.vlib_main;
clib_error_t *error;
- memset (&tx_addr, 0, sizeof (tx_addr));
+ clib_memset (&tx_addr, 0, sizeof (tx_addr));
tx_addr.sin_family = AF_INET;
tx_addr.sin_addr.s_addr = mc_socket_peer_id_get_address (dest_peer_id);
tx_addr.sin_port = mc_socket_peer_id_get_port (dest_peer_id);
vlib_main_t *vm = msm->mc_main.vlib_main;
vlib_buffer_t *b;
uword n_left, n_alloc, n_mtu, i, i_rx;
- const uword buffer_size = VLIB_BUFFER_DEFAULT_FREE_LIST_BYTES;
+ const uword buffer_size = vlib_buffer_get_default_data_size (vm);
word n_bytes_left;
/* Make sure we have at least a MTU worth of buffers. */
{
struct msghdr h;
- memset (&h, 0, sizeof (h));
+ clib_memset (&h, 0, sizeof (h));
if (rx_addr)
{
h.msg_name = rx_addr;
mc_multicast_socket_t *ms =
&msm->multicast_sockets[MC_TRANSPORT_MASTERSHIP];
clib_error_t *error;
- u32 bi;
+ u32 bi = 0;
error = recvmsg_helper (msm, ms->socket, /* rx_addr */ 0, &bi, /* drop_message */
0);
mc_multicast_socket_t *ms_from_relay =
&msm->multicast_sockets[MC_TRANSPORT_USER_REQUEST_FROM_RELAY];
clib_error_t *error;
- u32 bi;
+ u32 bi = 0;
u32 is_master = mcm->relay_state == MC_RELAY_STATE_MASTER;
/* Not the ordering master? Turf the msg */
mc_multicast_socket_t *ms =
&msm->multicast_sockets[MC_TRANSPORT_USER_REQUEST_FROM_RELAY];
clib_error_t *error;
- u32 bi;
+ u32 bi = 0;
error = recvmsg_helper (msm, ms->socket, /* rx_addr */ 0, &bi, /* drop_message */
0);
vlib_main_t *vm = mcm->vlib_main;
mc_multicast_socket_t *ms = &msm->multicast_sockets[MC_TRANSPORT_JOIN];
clib_error_t *error;
- u32 bi;
+ u32 bi = 0;
error = recvmsg_helper (msm, ms->socket, /* rx_addr */ 0, &bi, /* drop_message */
0);
mc_socket_main_t *msm = (mc_socket_main_t *) uf->private_data;
mc_main_t *mcm = &msm->mc_main;
clib_error_t *error;
- u32 bi;
+ u32 bi = 0;
error = recvmsg_helper (msm, msm->ack_socket, /* rx_addr */ 0, &bi,
/* drop_message */ 0);
clib_file_t template = { 0 };
pool_get (msm->catchups, c);
- memset (c, 0, sizeof (c[0]));
+ clib_memset (c, 0, sizeof (c[0]));
client_len = sizeof (client_addr);
template.write_function = catchup_server_write_ready;
template.error_function = catchup_socket_error_ready;
template.file_descriptor = c->socket;
+ template.description = format (0, "multicast catchup socket");
template.private_data = pointer_to_uword (msm);
c->clib_file_index = clib_file_add (&file_main, &template);
hash_set (msm->catchup_index_by_file_descriptor, c->socket,
{
struct sockaddr_in a;
- memset (&a, 0, sizeof (a)); /* Warnings be gone */
+ clib_memset (&a, 0, sizeof (a)); /* Warnings be gone */
a.sin_family = PF_INET;
a.sin_addr.s_addr = INADDR_ANY;
0)
return clib_error_return_unix (0, "%s setsockopt SO_REUSEADDR", type);
- memset (&ms->tx_addr, 0, sizeof (ms->tx_addr));
+ clib_memset (&ms->tx_addr, 0, sizeof (ms->tx_addr));
ms->tx_addr.sin_family = AF_INET;
ms->tx_addr.sin_addr.s_addr =
htonl (msm->multicast_tx_ip4_address_host_byte_order);
sizeof (ms->tx_addr)) < 0)
return clib_error_return_unix (0, "%s bind", type);
- memset (&mcast_req, 0, sizeof (mcast_req));
+ clib_memset (&mcast_req, 0, sizeof (mcast_req));
mcast_req.imr_multiaddr.s_addr =
htonl (msm->multicast_tx_ip4_address_host_byte_order);
mcast_req.imr_interface.s_addr = msm->if_ip4_address_net_byte_order;
template.file_descriptor =
msm->multicast_sockets[MC_TRANSPORT_USER_REQUEST_TO_RELAY].socket;
template.private_data = (uword) msm;
+ template.description = format (0, "multicast to_relay socket");
clib_file_add (&file_main, &template);
/* epoll setup for multicast from_relay socket */
template.file_descriptor =
msm->multicast_sockets[MC_TRANSPORT_USER_REQUEST_FROM_RELAY].socket;
template.private_data = (uword) msm;
+ template.description = format (0, "multicast from_relay socket");
clib_file_add (&file_main, &template);
template.read_function = join_socket_read_ready;
template.file_descriptor =
msm->multicast_sockets[MC_TRANSPORT_JOIN].socket;
template.private_data = (uword) msm;
+ template.description = format (0, "multicast join socket");
clib_file_add (&file_main, &template);
/* epoll setup for ack rx socket */
template.read_function = ack_socket_read_ready;
template.file_descriptor = msm->ack_socket;
template.private_data = (uword) msm;
+ template.description = format (0, "multicast ack rx socket");
clib_file_add (&file_main, &template);
/* epoll setup for TCP catchup server */
template.read_function = catchup_listen_read_ready;
template.file_descriptor = msm->catchup_server_socket;
template.private_data = (uword) msm;
+ template.description = format (0, "multicast tcp catchup socket");
clib_file_add (&file_main, &template);
}
int one = 1;
pool_get (msm->catchups, c);
- memset (c, 0, sizeof (*c));
+ clib_memset (c, 0, sizeof (*c));
c->socket = socket (AF_INET, SOCK_STREAM, 0);
if (c->socket < 0)
return 0;
}
- memset (&addr, 0, sizeof (addr));
+ clib_memset (&addr, 0, sizeof (addr));
addr.sin_family = AF_INET;
addr.sin_addr.s_addr = mc_socket_peer_id_get_address (catchup_peer_id);
addr.sin_port = mc_socket_peer_id_get_port (catchup_peer_id);
template.error_function = catchup_socket_error_ready;
template.file_descriptor = c->socket;
template.private_data = (uword) msm;
+ template.description = format (0, "multicast socket");
c->clib_file_index = clib_file_add (um, &template);
hash_set (msm->catchup_index_by_file_descriptor, c->socket,
msm->rx_mtu_n_bytes = mtu;
msm->rx_mtu_n_buffers =
- msm->rx_mtu_n_bytes / VLIB_BUFFER_DEFAULT_FREE_LIST_BYTES;
+ msm->rx_mtu_n_bytes / vlib_buffer_get_default_data_size (vm);
msm->rx_mtu_n_buffers +=
- (msm->rx_mtu_n_bytes % VLIB_BUFFER_DEFAULT_FREE_LIST_BYTES) != 0;
+ (msm->rx_mtu_n_bytes % vlib_buffer_get_default_data_size (vm)) != 0;
error = socket_setup (msm);
if (error)