{
clib_error_t *e = 0;
mif->local_disc_string = vec_dup (err->what);
- if (mif->conn_fd > -1)
+ if (mif->sock && clib_socket_is_connected (mif->sock))
e = memif_msg_send_disconnect (mif, err);
clib_error_free (e);
}
vnet_hw_interface_set_flags (vnm, mif->hw_if_index, 0);
/* close connection socket */
- if (mif->conn_clib_file_index != ~0)
+ if (mif->sock && mif->sock->fd)
{
memif_socket_file_t *msf = vec_elt_at_index (mm->socket_files,
mif->socket_file_index);
- hash_unset (msf->dev_instance_by_fd, mif->conn_fd);
- memif_file_del_by_index (mif->conn_clib_file_index);
- mif->conn_clib_file_index = ~0;
+ hash_unset (msf->dev_instance_by_fd, mif->sock->fd);
+ memif_socket_close (&mif->sock);
+ }
+ else if (mif->sock)
+ {
+ clib_error_t *err;
+ err = clib_socket_close (mif->sock);
+ if (err)
+ clib_error_report (err);
+ clib_mem_free (mif->sock);
}
- else if (mif->conn_fd > -1)
- close (mif->conn_fd);
- mif->conn_fd = -1;
vec_foreach_index (i, mif->rx_queues)
{
close (mr->fd);
}
vec_free (mif->regions);
-
- mif->remote_pid = 0;
vec_free (mif->remote_name);
vec_free (mif->remote_if_name);
clib_fifo_free (mif->msg_queue);
{
memif_main_t *mm = &memif_main;
memif_if_t *mif;
- struct sockaddr_un sun;
- int sockfd;
+ clib_socket_t *sock;
uword *event_data = 0, event_type;
u8 enabled = 0;
f64 start_time, last_run_duration = 0, now;
+ clib_error_t *err;
- sockfd = socket (AF_UNIX, SOCK_SEQPACKET, 0);
- if (sockfd < 0)
- {
- DBG_UNIX_LOG ("socket AF_UNIX");
- return 0;
- }
- sun.sun_family = AF_UNIX;
+ sock = clib_mem_alloc (sizeof (clib_socket_t));
+ memset (sock, 0, sizeof (clib_socket_t));
while (1)
{
if (mif->flags & MEMIF_IF_FLAG_IS_SLAVE)
{
- strncpy (sun.sun_path, (char *) msf->filename,
- sizeof (sun.sun_path) - 1);
-
- if (connect
- (sockfd, (struct sockaddr *) &sun,
- sizeof (struct sockaddr_un)) == 0)
+ memset (sock, 0, sizeof(clib_socket_t));
+ sock->config = (char *) msf->filename;
+ sock->flags = CLIB_SOCKET_F_IS_CLIENT| CLIB_SOCKET_F_SEQPACKET;
+
+ if ((err = clib_socket_init (sock)))
+ {
+ clib_error_free (err);
+ }
+ else
{
clib_file_t t = { 0 };
- mif->conn_fd = sockfd;
t.read_function = memif_slave_conn_fd_read_ready;
t.write_function = memif_slave_conn_fd_write_ready;
t.error_function = memif_slave_conn_fd_error;
- t.file_descriptor = mif->conn_fd;
+ t.file_descriptor = sock->fd;
t.private_data = mif->dev_instance;
- memif_file_add (&mif->conn_clib_file_index, &t);
- hash_set (msf->dev_instance_by_fd, mif->conn_fd, mif->dev_instance);
+ memif_file_add (&sock->private_data, &t);
+ hash_set (msf->dev_instance_by_fd, sock->fd, mif->dev_instance);
mif->flags |= MEMIF_IF_FLAG_CONNECTING;
-
- /* grab another fd */
- sockfd = socket (AF_UNIX, SOCK_SEQPACKET, 0);
- if (sockfd < 0)
- {
- DBG_UNIX_LOG ("socket AF_UNIX");
- return 0;
- }
+ mif->sock = sock;
+ sock = clib_mem_alloc (sizeof(clib_socket_t));
}
}
}));
{
if (msf->is_listener)
{
- uword *x;
- memif_file_del_by_index (msf->clib_file_index);
- vec_foreach (x, msf->pending_file_indices)
+ int i;
+ vec_foreach_index (i, msf->pending_clients)
{
- memif_file_del_by_index (*x);
+ memif_socket_close (msf->pending_clients + i);
}
- vec_free (msf->pending_file_indices);
+ memif_socket_close (&msf->sock);
+ vec_free (msf->pending_clients);
}
mhash_free (&msf->dev_instance_by_id);
hash_free (msf->dev_instance_by_fd);
mhash_unset (&mm->socket_file_index_by_filename, msf->filename, 0);
vec_free (msf->filename);
+ if (msf->sock)
+ {
+ err = clib_socket_close (msf->sock);
+ if (err)
+ clib_error_report (err);
+ clib_mem_free (msf->sock);
+ }
pool_put (mm->socket_files, msf);
}
sizeof (memif_interface_id_t));
msf->dev_instance_by_fd = hash_create (0, sizeof (uword));
msf->filename = socket_filename;
- msf->fd = -1;
msf->is_listener = (args->is_master != 0);
socket_filename = 0;
mhash_set (&mm->socket_file_index_by_filename, msf->filename,
mif->socket_file_index = msf - mm->socket_files;
mif->id = args->id;
mif->sw_if_index = mif->hw_if_index = mif->per_interface_next_index = ~0;
- mif->conn_clib_file_index = ~0;
- mif->conn_fd = -1;
mif->mode = args->mode;
if (args->secret)
mif->secret = vec_dup (args->secret);
/* If this is new one, start listening */
if (msf->is_listener && msf->ref_cnt == 0)
{
- struct sockaddr_un un = { 0 };
struct stat file_stat;
- int on = 1;
+ clib_socket_t *s = clib_mem_alloc (sizeof (clib_socket_t));
- if ((msf->fd = socket (AF_UNIX, SOCK_SEQPACKET, 0)) < 0)
- {
- ret = VNET_API_ERROR_SYSCALL_ERROR_4;
- goto error;
- }
+ ASSERT (msf->sock == 0);
+ msf->sock = s;
- un.sun_family = AF_UNIX;
- strncpy ((char *) un.sun_path, (char *) msf->filename,
- sizeof (un.sun_path) - 1);
+ memset (s, 0, sizeof (clib_socket_t));
+ s->config = (char *) msf->filename;
+ s->flags = CLIB_SOCKET_F_IS_SERVER |
+ CLIB_SOCKET_F_ALLOW_GROUP_WRITE |
+ CLIB_SOCKET_F_SEQPACKET | CLIB_SOCKET_F_PASSCRED;
- if (setsockopt (msf->fd, SOL_SOCKET, SO_PASSCRED, &on, sizeof (on)) < 0)
+ if ((error = clib_socket_init (s)))
{
- ret = VNET_API_ERROR_SYSCALL_ERROR_5;
- goto error;
- }
- if (bind (msf->fd, (struct sockaddr *) &un, sizeof (un)) == -1)
- {
- ret = VNET_API_ERROR_SYSCALL_ERROR_6;
- goto error;
- }
- if (listen (msf->fd, 1) == -1)
- {
- ret = VNET_API_ERROR_SYSCALL_ERROR_7;
+ clib_error_report (error);
+ ret = VNET_API_ERROR_SYSCALL_ERROR_4;
goto error;
}
goto error;
}
- msf->clib_file_index = ~0;
clib_file_t template = { 0 };
template.read_function = memif_conn_fd_accept_ready;
- template.file_descriptor = msf->fd;
+ template.file_descriptor = msf->sock->fd;
template.private_data = mif->socket_file_index;
- memif_file_add (&msf->clib_file_index, &template);
+ memif_file_add (&msf->sock->private_data, &template);
}
msf->ref_cnt++;
#include <memif/memif.h>
#include <memif/private.h>
+void
+memif_socket_close (clib_socket_t ** s)
+{
+ memif_file_del_by_index ((*s)->private_data);
+ clib_mem_free (*s);
+ *s = 0;
+}
+
static u8 *
memif_str2vec (uint8_t * str, int len)
{
return s;
}
-static clib_error_t *
-memif_msg_send (int fd, memif_msg_t * msg, int afd)
-{
- struct msghdr mh = { 0 };
- struct iovec iov[1];
- char ctl[CMSG_SPACE (sizeof (int))];
- int rv;
-
- iov[0].iov_base = (void *) msg;
- iov[0].iov_len = sizeof (memif_msg_t);
- mh.msg_iov = iov;
- mh.msg_iovlen = 1;
-
- if (afd > 0)
- {
- struct cmsghdr *cmsg;
- memset (&ctl, 0, sizeof (ctl));
- mh.msg_control = ctl;
- mh.msg_controllen = sizeof (ctl);
- cmsg = CMSG_FIRSTHDR (&mh);
- cmsg->cmsg_len = CMSG_LEN (sizeof (int));
- cmsg->cmsg_level = SOL_SOCKET;
- cmsg->cmsg_type = SCM_RIGHTS;
- memcpy (CMSG_DATA (cmsg), &afd, sizeof (int));
- }
- rv = sendmsg (fd, &mh, 0);
- if (rv < 0)
- return clib_error_return_unix (0, "sendmsg");
- DBG ("Message type %u sent (fd %d)", msg->type, afd);
- return 0;
-}
-
static void
memif_msg_enq_ack (memif_if_t * mif)
{
}
static clib_error_t *
-memif_msg_enq_hello (int fd)
+memif_msg_enq_hello (clib_socket_t * sock)
{
u8 *s;
memif_msg_t msg = { 0 };
s = format (0, "VPP %s%c", VPP_BUILD_VER, 0);
strncpy ((char *) h->name, (char *) s, sizeof (h->name) - 1);
vec_free (s);
- return memif_msg_send (fd, &msg, -1);
+ return clib_socket_sendmsg (sock, &msg, sizeof (memif_msg_t), 0, 0);
}
static void
d->code = err->code;
strncpy ((char *) d->string, (char *) err->what, sizeof (d->string) - 1);
- return memif_msg_send (mif->conn_fd, &msg, -1);
+ return clib_socket_sendmsg (mif->sock, &msg, sizeof (memif_msg_t), 0, 0);
}
static clib_error_t *
static clib_error_t *
memif_msg_receive_init (memif_if_t ** mifp, memif_msg_t * msg,
- clib_file_t * uf)
+ clib_socket_t * sock, uword socket_file_index)
{
memif_main_t *mm = &memif_main;
memif_socket_file_t *msf =
- vec_elt_at_index (mm->socket_files, uf->private_data);
+ vec_elt_at_index (mm->socket_files, socket_file_index);
memif_msg_init_t *i = &msg->init;
memif_if_t *mif, tmp;
clib_error_t *err;
if (i->version != MEMIF_VERSION)
{
- memif_file_del_by_index (uf - file_main.file_pool);
+ memif_file_del_by_index (sock->private_data);
return clib_error_return (0, "unsupported version");
}
goto error;
}
- if (mif->conn_fd != -1)
+ if (mif->sock)
{
err = clib_error_return (0, "already connected");
goto error;
goto error;
}
- mif->conn_fd = uf->file_descriptor;
- mif->conn_clib_file_index = uf - file_main.file_pool;
- hash_set (msf->dev_instance_by_fd, mif->conn_fd, mif->dev_instance);
+ mif->sock = sock;
+ hash_set (msf->dev_instance_by_fd, mif->sock->fd, mif->dev_instance);
mif->remote_name = memif_str2vec (i->name, sizeof (i->name));
*mifp = mif;
return 0;
error:
- tmp.conn_fd = uf->file_descriptor;
memif_msg_send_disconnect (&tmp, err);
- memif_file_del_by_index (uf - file_main.file_pool);
return err;
}
}
static clib_error_t *
-memif_msg_receive (memif_if_t ** mifp, clib_file_t * uf)
+memif_msg_receive (memif_if_t ** mifp, clib_socket_t * sock, clib_file_t * uf)
{
- char ctl[CMSG_SPACE (sizeof (int)) +
- CMSG_SPACE (sizeof (struct ucred))] = { 0 };
- struct msghdr mh = { 0 };
- struct iovec iov[1];
memif_msg_t msg = { 0 };
- ssize_t size;
clib_error_t *err = 0;
int fd = -1;
int i;
memif_if_t *mif = *mifp;
- iov[0].iov_base = (void *) &msg;
- iov[0].iov_len = sizeof (memif_msg_t);
- mh.msg_iov = iov;
- mh.msg_iovlen = 1;
- mh.msg_control = ctl;
- mh.msg_controllen = sizeof (ctl);
-
- /* receive the incoming message */
- size = recvmsg (uf->file_descriptor, &mh, 0);
- if (size != sizeof (memif_msg_t))
- {
- return (size == 0) ? clib_error_return (0, "disconnected") :
- clib_error_return_unix (0,
- "recvmsg: malformed message received on fd %d",
- uf->file_descriptor);
- }
+ err = clib_socket_recvmsg (sock, &msg, sizeof (memif_msg_t), &fd, 1);
+ if (err)
+ return err;
if (mif == 0 && msg.type != MEMIF_MSG_TYPE_INIT)
{
- memif_file_del (uf);
+ memif_socket_close (&sock);
return clib_error_return (0, "unexpected message received");
}
- /* process anciliary data */
- struct ucred *cr = 0;
- struct cmsghdr *cmsg;
-
- cmsg = CMSG_FIRSTHDR (&mh);
- while (cmsg)
- {
- if (cmsg->cmsg_level == SOL_SOCKET)
- {
- if (cmsg->cmsg_type == SCM_CREDENTIALS)
- {
- cr = (struct ucred *) CMSG_DATA (cmsg);
- }
- else if (cmsg->cmsg_type == SCM_RIGHTS)
- {
- int *fdp = (int *) CMSG_DATA (cmsg);
- fd = *fdp;
- }
- }
- cmsg = CMSG_NXTHDR (&mh, cmsg);
- }
-
DBG ("Message type %u received", msg.type);
/* process the message based on its type */
switch (msg.type)
break;
case MEMIF_MSG_TYPE_INIT:
- if ((err = memif_msg_receive_init (mifp, &msg, uf)))
+ if ((err = memif_msg_receive_init (mifp, &msg, sock, uf->private_data)))
return err;
mif = *mifp;
- mif->remote_pid = cr->pid;
- mif->remote_uid = cr->uid;
- mif->remote_gid = cr->gid;
memif_msg_enq_ack (mif);
break;
return err;
}
- if (clib_fifo_elts (mif->msg_queue) && mif->conn_clib_file_index != ~0)
+ if (clib_fifo_elts (mif->msg_queue))
clib_file_set_data_available_to_write (&file_main,
- mif->conn_clib_file_index, 1);
+ mif->sock->private_data, 1);
return 0;
}
pool_elt_at_index (mm->socket_files, uf->private_data);
uword *p;
memif_if_t *mif = 0;
- uword conn_clib_file_index = ~0;
+ clib_socket_t *sock = 0;
clib_error_t *err = 0;
p = hash_get (msf->dev_instance_by_fd, uf->file_descriptor);
if (p)
{
mif = vec_elt_at_index (mm->interfaces, p[0]);
+ sock = mif->sock;
}
else
{
/* This is new connection, remove index from pending vector */
int i;
- vec_foreach_index (i, msf->pending_file_indices)
- if (msf->pending_file_indices[i] == uf - file_main.file_pool)
+ vec_foreach_index (i, msf->pending_clients)
+ if (msf->pending_clients[i]->fd == uf->file_descriptor)
{
- conn_clib_file_index = msf->pending_file_indices[i];
- vec_del1 (msf->pending_file_indices, i);
+ sock = msf->pending_clients[i];
+ vec_del1 (msf->pending_clients, i);
break;
}
- ASSERT (conn_clib_file_index != ~0);
+ ASSERT (sock != 0);
}
- err = memif_msg_receive (&mif, uf);
+ err = memif_msg_receive (&mif, sock, uf);
if (err)
{
memif_disconnect (mif, err);
memif_main_t *mm = &memif_main;
clib_error_t *err;
memif_if_t *mif = vec_elt_at_index (mm->interfaces, uf->private_data);
- err = memif_msg_receive (&mif, uf);
+ err = memif_msg_receive (&mif, mif->sock, uf);
if (err)
{
memif_disconnect (mif, err);
memif_msg_fifo_elt_t *e;
clib_fifo_sub2 (mif->msg_queue, e);
clib_file_set_data_available_to_write (&file_main,
- mif->conn_clib_file_index, 0);
- memif_msg_send (mif->conn_fd, &e->msg, e->fd);
- return 0;
+ mif->sock->private_data, 0);
+ return clib_socket_sendmsg (mif->sock, &e->msg, sizeof (memif_msg_t),
+ &e->fd, e->fd > -1 ? 1 : 0);
}
clib_error_t *
else
{
int i;
- vec_foreach_index (i, msf->pending_file_indices)
- if (msf->pending_file_indices[i] == uf - file_main.file_pool)
+ vec_foreach_index (i, msf->pending_clients)
+ if (msf->pending_clients[i]->fd == uf->file_descriptor)
{
- vec_del1 (msf->pending_file_indices, i);
- memif_file_del (uf);
+ clib_socket_t *s = msf->pending_clients[i];
+ memif_socket_close (&s);
+ vec_del1 (msf->pending_clients, i);
return 0;
}
}
memif_main_t *mm = &memif_main;
memif_socket_file_t *msf =
pool_elt_at_index (mm->socket_files, uf->private_data);
- int addr_len;
- struct sockaddr_un client;
- int conn_fd;
clib_file_t template = { 0 };
- uword clib_file_index = ~0;
clib_error_t *err;
+ clib_socket_t *client;
-
- addr_len = sizeof (client);
- conn_fd = accept (uf->file_descriptor,
- (struct sockaddr *) &client, (socklen_t *) & addr_len);
-
- if (conn_fd < 0)
- return clib_error_return_unix (0, "accept fd %d", uf->file_descriptor);
+ client = clib_mem_alloc (sizeof (clib_socket_t));
+ memset (client, 0, sizeof (clib_socket_t));
+ err = clib_socket_accept (msf->sock, client);
+ if (err)
+ goto error;
template.read_function = memif_master_conn_fd_read_ready;
template.write_function = memif_master_conn_fd_write_ready;
template.error_function = memif_master_conn_fd_error;
- template.file_descriptor = conn_fd;
+ template.file_descriptor = client->fd;
template.private_data = uf->private_data;
- memif_file_add (&clib_file_index, &template);
+ memif_file_add (&client->private_data, &template);
- err = memif_msg_enq_hello (conn_fd);
+ err = memif_msg_enq_hello (client);
if (err)
{
- clib_error_report (err);
- memif_file_del_by_index (clib_file_index);
+ clib_socket_close (client);
+ goto error;
}
- else
- vec_add1 (msf->pending_file_indices, clib_file_index);
+
+ vec_add1 (msf->pending_clients, client);
return 0;
+
+error:
+ clib_error_report (err);
+ clib_mem_free (client);
+ return err;
}
/*
Code Review / vpp.git / commitdiff