@@ -40,8 +40,8 @@ typedef struct NetSocketNGState {
int fd;
SocketReadState rs;
unsigned int send_index; /* number of bytes sent (only SOCK_STREAM) */
- /* contains inet host and port destination iff connectionless (SOCK_DGRAM) */
- struct sockaddr_in dgram_dst;
+ /* contains destination iff connectionless (SOCK_DGRAM) */
+ struct sockaddr *dgram_dst;
IOHandler *send_fn; /* differs between SOCK_STREAM/SOCK_DGRAM */
bool read_poll; /* waiting to receive data? */
bool write_poll; /* waiting to transmit data? */
@@ -122,10 +122,9 @@ static ssize_t net_socket_receive_dgram(NetClientState *nc,
ssize_t ret;
do {
- if (s->dgram_dst.sin_family != AF_UNIX) {
- ret = sendto(s->fd, buf, size, 0,
- (struct sockaddr *)&s->dgram_dst,
- sizeof(s->dgram_dst));
+ if (s->dgram_dst) {
+ ret = sendto(s->fd, buf, size, 0, s->dgram_dst,
+ sizeof(struct sockaddr_in));
} else {
ret = send(s->fd, buf, size, 0);
}
@@ -327,6 +326,8 @@ static void net_socket_cleanup(NetClientState *nc)
closesocket(s->listen_fd);
s->listen_fd = -1;
}
+ g_free(s->dgram_dst);
+ s->dgram_dst = NULL;
}
static NetClientInfo net_dgram_socket_info = {
@@ -343,7 +344,7 @@ static NetSocketNGState *net_socket_fd_init_dgram(NetClientState *peer,
SocketAddress *mcast,
Error **errp)
{
- struct sockaddr_in saddr;
+ struct sockaddr_in *saddr = NULL;
int newfd;
NetClientState *nc;
NetSocketNGState *s;
@@ -365,17 +366,19 @@ static NetSocketNGState *net_socket_fd_init_dgram(NetClientState *peer,
*/
if (is_fd && mcast != NULL) {
- if (convert_host_port(&saddr, mcast->u.inet.host,
- mcast->u.inet.port, errp) < 0) {
+ 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) {
+ 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);
+ newfd = net_socket_mcast_create(saddr, NULL, errp);
if (newfd < 0) {
goto err;
}
@@ -395,16 +398,13 @@ static NetSocketNGState *net_socket_fd_init_dgram(NetClientState *peer,
net_socket_read_poll(s, true);
/* mcast: save bound address as dst */
- if (is_fd && mcast != NULL) {
- s->dgram_dst = saddr;
+ 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));
+ fd, inet_ntoa(saddr->sin_addr), ntohs(saddr->sin_port));
} else {
- if (sa_type == SOCKET_ADDRESS_TYPE_UNIX) {
- s->dgram_dst.sin_family = AF_UNIX;
- }
-
snprintf(nc->info_str, sizeof(nc->info_str),
"socket-ng: fd=%d %s", fd, SocketAddressType_str(sa_type));
}
@@ -412,6 +412,7 @@ static NetSocketNGState *net_socket_fd_init_dgram(NetClientState *peer,
return s;
err:
+ g_free(saddr);
closesocket(fd);
return NULL;
}
@@ -741,21 +742,24 @@ static int net_socketng_mcast_init(NetClientState *peer,
{
NetSocketNGState *s;
int fd, ret;
- struct sockaddr_in saddr;
+ struct sockaddr_in *saddr;
if (remote->type != SOCKET_ADDRESS_TYPE_INET) {
error_setg(errp, "multicast only support inet type");
return -1;
}
- if (convert_host_port(&saddr, remote->u.inet.host, remote->u.inet.port,
+ saddr = g_new(struct sockaddr_in, 1);
+ if (convert_host_port(saddr, remote->u.inet.host, remote->u.inet.port,
errp) < 0) {
+ g_free(saddr);
return -1;
}
if (!local) {
- fd = net_socket_mcast_create(&saddr, NULL, errp);
+ fd = net_socket_mcast_create(saddr, NULL, errp);
if (fd < 0) {
+ g_free(saddr);
return -1;
}
} else {
@@ -764,13 +768,15 @@ static int net_socketng_mcast_init(NetClientState *peer,
struct in_addr localaddr;
if (inet_aton(local->u.inet.host, &localaddr) == 0) {
+ g_free(saddr);
error_setg(errp, "localaddr '%s' is not a valid IPv4 address",
local->u.inet.host);
return -1;
}
- fd = net_socket_mcast_create(&saddr, &localaddr, errp);
+ fd = net_socket_mcast_create(saddr, &localaddr, errp);
if (fd < 0) {
+ g_free(saddr);
return -1;
}
break;
@@ -778,16 +784,19 @@ static int net_socketng_mcast_init(NetClientState *peer,
case SOCKET_ADDRESS_TYPE_FD:
fd = monitor_fd_param(monitor_cur(), local->u.fd.str, errp);
if (fd == -1) {
+ g_free(saddr);
return -1;
}
ret = qemu_socket_try_set_nonblock(fd);
if (ret < 0) {
+ g_free(saddr);
error_setg_errno(errp, -ret, "%s: Can't use file descriptor %d",
name, fd);
return -1;
}
break;
default:
+ g_free(saddr);
error_setg(errp, "only support inet or fd type for local");
return -1;
}
@@ -797,14 +806,17 @@ static int net_socketng_mcast_init(NetClientState *peer,
local->type == SOCKET_ADDRESS_TYPE_FD,
remote, errp);
if (!s) {
+ g_free(saddr);
return -1;
}
- s->dgram_dst = saddr;
+ 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));
+ inet_ntoa(saddr->sin_addr), ntohs(saddr->sin_port));
+
return 0;
}
@@ -818,8 +830,8 @@ static int net_socketng_udp_init(NetClientState *peer,
{
NetSocketNGState *s;
int fd, ret;
- struct sockaddr_in raddr_in;
gchar *info_str;
+ struct sockaddr *dgram_dst;
if (remote) {
if (local->type == SOCKET_ADDRESS_TYPE_FD) {
@@ -840,7 +852,7 @@ static int net_socketng_udp_init(NetClientState *peer,
switch (local->type) {
case SOCKET_ADDRESS_TYPE_INET: {
- struct sockaddr_in laddr_in;
+ struct sockaddr_in laddr_in, raddr_in;
if (convert_host_port(&laddr_in, local->u.inet.host, local->u.inet.port,
errp) < 0) {
@@ -874,9 +886,12 @@ static int net_socketng_udp_init(NetClientState *peer,
}
qemu_socket_set_nonblock(fd);
+ dgram_dst = g_malloc(sizeof(raddr_in));
+ memcpy(dgram_dst, &raddr_in, sizeof(raddr_in));
+
info_str = g_strdup_printf("socket-ng: udp=%s:%d/%s:%d",
- inet_ntoa(laddr_in.sin_addr), ntohs(laddr_in.sin_port),
- inet_ntoa(raddr_in.sin_addr), ntohs(raddr_in.sin_port));
+ inet_ntoa(laddr_in.sin_addr), ntohs(laddr_in.sin_port),
+ inet_ntoa(raddr_in.sin_addr), ntohs(raddr_in.sin_port));
break;
}
@@ -903,13 +918,14 @@ static int net_socketng_udp_init(NetClientState *peer,
}
if (remote) {
- s->dgram_dst = raddr_in;
+ 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;
-}
+};
static int net_socketng_dgram_init(NetClientState *peer,
const char *model,
dgram_dst is a sockaddr_in structure. To be able to use it with unix socket, use a pointer to a generic sockaddr structure. Signed-off-by: Laurent Vivier <lvivier@redhat.com> --- net/socket-ng.c | 76 ++++++++++++++++++++++++++++++------------------- 1 file changed, 46 insertions(+), 30 deletions(-)