[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 19/19] net: add the support for -netdev socket, list
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PATCH 19/19] net: add the support for -netdev socket, listen |
Date: |
Wed, 1 Aug 2012 13:54:51 +0100 |
From: Zhi Yong Wu <address@hidden>
The -net socket,listen option does not work with the newer -netdev
syntax:
http://lists.gnu.org/archive/html/qemu-devel/2011-11/msg01508.html
This patch makes it work now.
For the case where one vlan has multiple listenning sockets,
the patch will also provide the support.
Supported syntax:
1.) -net socket,listen=127.0.0.1:1234,vlan=0
2.) -net socket,listen=127.0.0.1:1234,vlan=0 -net
socket,listen=127.0.0.1:1235,vlan=0
3.) -netdev socket,listen=127.0.0.1:1234,id=socket0
Drop the NetSocketListenState struct and add a listen_fd field
to NetSocketState. When a -netdev socket,listen= instance is created
there will be a NetSocketState with fd=-1 and a valid listen_fd. The
net_socket_accept() handler waits for listen_fd to become readable and
then accepts the connection. When this state transition happens, we no
longer monitor listen_fd for incoming connections...until the client
disconnects again.
Signed-off-by: Zhi Yong Wu <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>
Reviewed-by: Laszlo Ersek <address@hidden>
---
net/socket.c | 76 ++++++++++++++++++++++++++++++++++++----------------------
1 file changed, 47 insertions(+), 29 deletions(-)
diff --git a/net/socket.c b/net/socket.c
index 7857dcd..c172c24 100644
--- a/net/socket.c
+++ b/net/socket.c
@@ -35,6 +35,7 @@
typedef struct NetSocketState {
NetClientState nc;
+ int listen_fd;
int fd;
int state; /* 0 = getting length, 1 = getting data */
unsigned int index;
@@ -43,12 +44,7 @@ typedef struct NetSocketState {
struct sockaddr_in dgram_dst; /* contains inet host and port destination
iff connectionless (SOCK_DGRAM) */
} NetSocketState;
-typedef struct NetSocketListenState {
- NetClientState *peer;
- char *model;
- char *name;
- int fd;
-} NetSocketListenState;
+static void net_socket_accept(void *opaque);
/* XXX: we consider we can send the whole packet without blocking */
static ssize_t net_socket_receive(NetClientState *nc, const uint8_t *buf,
size_t size)
@@ -86,7 +82,19 @@ static void net_socket_send(void *opaque)
/* end of connection */
eoc:
qemu_set_fd_handler(s->fd, NULL, NULL, NULL);
+ if (s->listen_fd != -1) {
+ qemu_set_fd_handler(s->listen_fd, net_socket_accept, NULL, s);
+ }
closesocket(s->fd);
+
+ s->fd = -1;
+ s->state = 0;
+ s->index = 0;
+ s->packet_len = 0;
+ s->nc.link_down = true;
+ memset(s->buf, 0, sizeof(s->buf));
+ memset(s->nc.info_str, 0, sizeof(s->nc.info_str));
+
return;
}
buf = buf1;
@@ -234,8 +242,16 @@ fail:
static void net_socket_cleanup(NetClientState *nc)
{
NetSocketState *s = DO_UPCAST(NetSocketState, nc, nc);
- qemu_set_fd_handler(s->fd, NULL, NULL, NULL);
- close(s->fd);
+ if (s->fd != -1) {
+ qemu_set_fd_handler(s->fd, NULL, NULL, NULL);
+ close(s->fd);
+ s->fd = -1;
+ }
+ if (s->listen_fd != -1) {
+ qemu_set_fd_handler(s->listen_fd, NULL, NULL, NULL);
+ closesocket(s->listen_fd);
+ s->listen_fd = -1;
+ }
}
static NetClientInfo net_dgram_socket_info = {
@@ -297,6 +313,7 @@ static NetSocketState
*net_socket_fd_init_dgram(NetClientState *peer,
s = DO_UPCAST(NetSocketState, nc, nc);
s->fd = fd;
+ s->listen_fd = -1;
qemu_set_fd_handler(s->fd, net_socket_send_dgram, NULL, s);
@@ -340,6 +357,7 @@ static NetSocketState
*net_socket_fd_init_stream(NetClientState *peer,
s = DO_UPCAST(NetSocketState, nc, nc);
s->fd = fd;
+ s->listen_fd = -1;
if (is_connected) {
net_socket_connect(s);
@@ -377,27 +395,28 @@ static NetSocketState *net_socket_fd_init(NetClientState
*peer,
static void net_socket_accept(void *opaque)
{
- NetSocketListenState *s = opaque;
- NetSocketState *s1;
+ NetSocketState *s = opaque;
struct sockaddr_in saddr;
socklen_t len;
int fd;
for(;;) {
len = sizeof(saddr);
- fd = qemu_accept(s->fd, (struct sockaddr *)&saddr, &len);
+ fd = qemu_accept(s->listen_fd, (struct sockaddr *)&saddr, &len);
if (fd < 0 && errno != EINTR) {
return;
} else if (fd >= 0) {
+ qemu_set_fd_handler(s->listen_fd, NULL, NULL, NULL);
break;
}
}
- s1 = net_socket_fd_init(s->peer, s->model, s->name, fd, 1);
- if (s1) {
- snprintf(s1->nc.info_str, sizeof(s1->nc.info_str),
- "socket: connection from %s:%d",
- inet_ntoa(saddr.sin_addr), ntohs(saddr.sin_port));
- }
+
+ s->fd = fd;
+ s->nc.link_down = false;
+ net_socket_connect(s);
+ snprintf(s->nc.info_str, sizeof(s->nc.info_str),
+ "socket: connection from %s:%d",
+ inet_ntoa(saddr.sin_addr), ntohs(saddr.sin_port));
}
static int net_socket_listen_init(NetClientState *peer,
@@ -405,19 +424,17 @@ static int net_socket_listen_init(NetClientState *peer,
const char *name,
const char *host_str)
{
- NetSocketListenState *s;
- int fd, val, ret;
+ NetClientState *nc;
+ NetSocketState *s;
struct sockaddr_in saddr;
+ int fd, val, ret;
if (parse_host_port(&saddr, host_str) < 0)
return -1;
- s = g_malloc0(sizeof(NetSocketListenState));
-
fd = qemu_socket(PF_INET, SOCK_STREAM, 0);
if (fd < 0) {
perror("socket");
- g_free(s);
return -1;
}
socket_set_nonblock(fd);
@@ -429,22 +446,23 @@ static int net_socket_listen_init(NetClientState *peer,
ret = bind(fd, (struct sockaddr *)&saddr, sizeof(saddr));
if (ret < 0) {
perror("bind");
- g_free(s);
closesocket(fd);
return -1;
}
ret = listen(fd, 0);
if (ret < 0) {
perror("listen");
- g_free(s);
closesocket(fd);
return -1;
}
- s->peer = peer;
- s->model = g_strdup(model);
- s->name = name ? g_strdup(name) : NULL;
- s->fd = fd;
- qemu_set_fd_handler(fd, net_socket_accept, NULL, s);
+
+ nc = qemu_new_net_client(&net_socket_info, peer, model, name);
+ s = DO_UPCAST(NetSocketState, nc, nc);
+ s->fd = -1;
+ s->listen_fd = fd;
+ s->nc.link_down = true;
+
+ qemu_set_fd_handler(s->listen_fd, net_socket_accept, NULL, s);
return 0;
}
--
1.7.10.4
- [Qemu-devel] [PULL 00/19] Net patches for QEMU 1.2, Stefan Hajnoczi, 2012/08/01
- [Qemu-devel] [PATCH 03/19] net: Use hubs for the vlan feature, Stefan Hajnoczi, 2012/08/01
- [Qemu-devel] [PATCH 06/19] net: Drop vlan argument to qemu_new_net_client(), Stefan Hajnoczi, 2012/08/01
- [Qemu-devel] [PATCH 17/19] hub: add the support for hub own flow control, Stefan Hajnoczi, 2012/08/01
- [Qemu-devel] [PATCH 05/19] hub: Check that hubs are configured correctly, Stefan Hajnoczi, 2012/08/01
- [Qemu-devel] [PATCH 07/19] net: Convert qdev_prop_vlan to peer with hub, Stefan Hajnoczi, 2012/08/01
- [Qemu-devel] [PATCH 10/19] net: Rename non_vlan_clients to net_clients, Stefan Hajnoczi, 2012/08/01
- [Qemu-devel] [PATCH 01/19] net: Add interface to bridge when SIOCBRADDIF isn't available, Stefan Hajnoczi, 2012/08/01
- [Qemu-devel] [PATCH 14/19] net: Make "info network" output more readable info, Stefan Hajnoczi, 2012/08/01
- [Qemu-devel] [PATCH 16/19] net: determine if packets can be sent before net queue deliver packets, Stefan Hajnoczi, 2012/08/01
- [Qemu-devel] [PATCH 19/19] net: add the support for -netdev socket, listen,
Stefan Hajnoczi <=
- [Qemu-devel] [PATCH 18/19] net: fix the coding style, Stefan Hajnoczi, 2012/08/01
- [Qemu-devel] [PATCH 08/19] net: Remove vlan code from net.c, Stefan Hajnoczi, 2012/08/01
- [Qemu-devel] [PATCH 12/19] net: Rename vc local variables to nc, Stefan Hajnoczi, 2012/08/01
- [Qemu-devel] [PATCH 13/19] net: Rename qemu_del_vlan_client() to qemu_del_net_client(), Stefan Hajnoczi, 2012/08/01
- [Qemu-devel] [PATCH 11/19] net: Rename VLANClientState to NetClientState, Stefan Hajnoczi, 2012/08/01
- [Qemu-devel] [PATCH 09/19] net: Remove VLANState, Stefan Hajnoczi, 2012/08/01
- [Qemu-devel] [PATCH 04/19] net: Look up 'vlan' net clients using hubs, Stefan Hajnoczi, 2012/08/01
- [Qemu-devel] [PATCH 02/19] net: Add a hub net client, Stefan Hajnoczi, 2012/08/01
- [Qemu-devel] [PATCH 15/19] net: cleanup deliver/deliver_iov func pointers, Stefan Hajnoczi, 2012/08/01
- Re: [Qemu-devel] [PULL 00/19] Net patches for QEMU 1.2, Anthony Liguori, 2012/08/03