@@ -340,52 +340,11 @@ static NetClientInfo net_dgram_socket_info = {
static NetSocketNGState *net_socket_fd_init_dgram(NetClientState *peer,
const char *model,
const char *name,
- int fd, int is_fd,
- SocketAddress *mcast,
+ int fd,
Error **errp)
{
- struct sockaddr_in *saddr = NULL;
- int newfd;
NetClientState *nc;
NetSocketNGState *s;
- SocketAddress *sa;
- SocketAddressType sa_type;
-
- sa = socket_local_address(fd, errp);
- if (!sa) {
- return NULL;
- }
- sa_type = sa->type;
- qapi_free_SocketAddress(sa);
-
- /*
- * fd passed: multicast: "learn" dgram_dst address from bound address and
- * save it. Because this may be "shared" socket from a "master" process,
- * datagrams would be recv() by ONLY ONE process: we must "clone" this
- * dgram socket --jjo
- */
-
- if (is_fd && mcast != NULL) {
- saddr = g_new(struct sockaddr_in, 1);
-
- if (convert_host_port(saddr, mcast->u.inet.host, mcast->u.inet.port,
- errp) < 0) {
- goto err;
- }
- /* must be bound */
- if (saddr->sin_addr.s_addr == 0) {
- error_setg(errp, "can't setup multicast destination address");
- goto err;
- }
- /* clone dgram socket */
- newfd = net_socket_mcast_create(saddr, NULL, errp);
- if (newfd < 0) {
- goto err;
- }
- /* clone newfd to fd, close newfd */
- dup2(newfd, fd);
- close(newfd);
- }
nc = qemu_new_net_client(&net_dgram_socket_info, peer, model, name);
@@ -397,24 +356,7 @@ static NetSocketNGState *net_socket_fd_init_dgram(NetClientState *peer,
net_socket_rs_init(&s->rs, net_socket_rs_finalize, false);
net_socket_read_poll(s, true);
- /* mcast: save bound address as dst */
- if (saddr) {
- g_assert(s->dgram_dst == NULL);
- s->dgram_dst = (struct sockaddr *)saddr;
- snprintf(nc->info_str, sizeof(nc->info_str),
- "socket-ng: fd=%d (cloned mcast=%s:%d)",
- fd, inet_ntoa(saddr->sin_addr), ntohs(saddr->sin_port));
- } else {
- snprintf(nc->info_str, sizeof(nc->info_str),
- "socket-ng: fd=%d %s", fd, SocketAddressType_str(sa_type));
- }
-
return s;
-
-err:
- g_free(saddr);
- closesocket(fd);
- return NULL;
}
static void net_socket_connect(void *opaque)
@@ -743,6 +685,7 @@ static int net_socketng_mcast_init(NetClientState *peer,
NetSocketNGState *s;
int fd, ret;
struct sockaddr_in *saddr;
+ gchar *info_str;
if (remote->type != SOCKET_ADDRESS_TYPE_INET) {
error_setg(errp, "multicast only support inet type");
@@ -762,6 +705,9 @@ static int net_socketng_mcast_init(NetClientState *peer,
g_free(saddr);
return -1;
}
+ info_str = g_strdup_printf("socket-ng: mcast=%s:%d",
+ inet_ntoa(saddr->sin_addr),
+ ntohs(saddr->sin_port));
} else {
switch (local->type) {
case SOCKET_ADDRESS_TYPE_INET: {
@@ -779,9 +725,14 @@ static int net_socketng_mcast_init(NetClientState *peer,
g_free(saddr);
return -1;
}
+ info_str = g_strdup_printf("socket-ng: mcast=%s:%d",
+ inet_ntoa(saddr->sin_addr),
+ ntohs(saddr->sin_port));
break;
}
- case SOCKET_ADDRESS_TYPE_FD:
+ case SOCKET_ADDRESS_TYPE_FD: {
+ int newfd;
+
fd = monitor_fd_param(monitor_cur(), local->u.fd.str, errp);
if (fd == -1) {
g_free(saddr);
@@ -794,7 +745,46 @@ static int net_socketng_mcast_init(NetClientState *peer,
name, fd);
return -1;
}
+
+ /*
+ * fd passed: multicast: "learn" dgram_dst address from bound
+ * address and save it. Because this may be "shared" socket from a
+ * "master" process, datagrams would be recv() by ONLY ONE process:
+ * we must "clone" this dgram socket --jjo
+ */
+
+ saddr = g_new(struct sockaddr_in, 1);
+
+ if (convert_host_port(saddr, local->u.inet.host, local->u.inet.port,
+ errp) < 0) {
+ g_free(saddr);
+ closesocket(fd);
+ return -1;
+ }
+
+ /* must be bound */
+ if (saddr->sin_addr.s_addr == 0) {
+ error_setg(errp, "can't setup multicast destination address");
+ g_free(saddr);
+ closesocket(fd);
+ return -1;
+ }
+ /* clone dgram socket */
+ newfd = net_socket_mcast_create(saddr, NULL, errp);
+ if (newfd < 0) {
+ g_free(saddr);
+ closesocket(fd);
+ return -1;
+ }
+ /* clone newfd to fd, close newfd */
+ dup2(newfd, fd);
+ close(newfd);
+
+ info_str = g_strdup_printf("socket-ng: fd=%d (cloned mcast=%s:%d)",
+ fd, inet_ntoa(saddr->sin_addr),
+ ntohs(saddr->sin_port));
break;
+ }
default:
g_free(saddr);
error_setg(errp, "only support inet or fd type for local");
@@ -802,9 +792,7 @@ static int net_socketng_mcast_init(NetClientState *peer,
}
}
- s = net_socket_fd_init_dgram(peer, model, name, fd,
- local->type == SOCKET_ADDRESS_TYPE_FD,
- remote, errp);
+ s = net_socket_fd_init_dgram(peer, model, name, fd, errp);
if (!s) {
g_free(saddr);
return -1;
@@ -813,9 +801,8 @@ static int net_socketng_mcast_init(NetClientState *peer,
g_assert(s->dgram_dst == NULL);
s->dgram_dst = (struct sockaddr *)saddr;
- snprintf(s->nc.info_str, sizeof(s->nc.info_str),
- "socket-ng: mcast=%s:%d",
- inet_ntoa(saddr->sin_addr), ntohs(saddr->sin_port));
+ pstrcpy(s->nc.info_str, sizeof(s->nc.info_str), info_str);
+ g_free(info_str);
return 0;
@@ -895,7 +882,10 @@ static int net_socketng_udp_init(NetClientState *peer,
break;
}
- case SOCKET_ADDRESS_TYPE_FD:
+ case SOCKET_ADDRESS_TYPE_FD: {
+ SocketAddress *sa;
+ SocketAddressType sa_type;
+
fd = monitor_fd_param(monitor_cur(), local->u.fd.str, errp);
if (fd == -1) {
return -1;
@@ -906,23 +896,35 @@ static int net_socketng_udp_init(NetClientState *peer,
name, fd);
return -1;
}
+
+ sa = socket_local_address(fd, errp);
+ if (sa) {
+ sa_type = sa->type;
+ qapi_free_SocketAddress(sa);
+
+ info_str = g_strdup_printf("socket: fd=%d %s", fd,
+ SocketAddressType_str(sa_type));
+ } else {
+ info_str = g_strdup_printf("socket: fd=%d", fd);
+ }
break;
+ }
default:
error_setg(errp, "only support inet or fd type for local");
return -1;
}
- s = net_socket_fd_init_dgram(peer, model, name, fd, 0, NULL, errp);
+ s = net_socket_fd_init_dgram(peer, model, name, fd, errp);
if (!s) {
return -1;
}
+ pstrcpy(s->nc.info_str, sizeof(s->nc.info_str), info_str);
+ g_free(info_str);
+
if (remote) {
g_assert(s->dgram_dst == NULL);
s->dgram_dst = dgram_dst;
-
- pstrcpy(s->nc.info_str, sizeof(s->nc.info_str), info_str);
- g_free(info_str);
}
return 0;
};
It is less complex to manage special cases directly in net_socketng_mcast_init() and net_socketng_udp_init(). Signed-off-by: Laurent Vivier <lvivier@redhat.com> --- net/socket-ng.c | 144 ++++++++++++++++++++++++------------------------ 1 file changed, 73 insertions(+), 71 deletions(-)