From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:43760) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Rvjwl-0007Uk-3O for qemu-devel@nongnu.org; Fri, 10 Feb 2012 01:27:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Rvjwj-0003Ya-Ro for qemu-devel@nongnu.org; Fri, 10 Feb 2012 01:27:03 -0500 Received: from mx1.redhat.com ([209.132.183.28]:25852) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Rvjwj-0003YI-Hv for qemu-devel@nongnu.org; Fri, 10 Feb 2012 01:27:01 -0500 From: Amos Kong Date: Fri, 10 Feb 2012 14:27:10 +0800 Message-ID: <20120210062710.13397.86783.stgit@dhcp-8-167.nay.redhat.com> In-Reply-To: <20120210062608.13397.43361.stgit@dhcp-8-167.nay.redhat.com> References: <20120210062608.13397.43361.stgit@dhcp-8-167.nay.redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Subject: [Qemu-devel] [PATCH 2/4] net/socket: allow ipv6 for net_socket_listen_init and socket_connect_init List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: aliguori@us.ibm.com, kvm@vger.kernel.org, quintela@redhat.com, jasowang@redhat.com, qemu-devel@nongnu.org, laine@redhat.com, akong@redhat.com Remove use of parse_host_port. More SO_SOCKADDR changes. Signed-off-by: Juan Quintela Signed-off-by: Amos Kong --- net/socket.c | 60 +++++++++++----------------------------------------------- 1 files changed, 11 insertions(+), 49 deletions(-) diff --git a/net/socket.c b/net/socket.c index d4c2002..439a69c 100644 --- a/net/socket.c +++ b/net/socket.c @@ -403,29 +403,13 @@ static int net_socket_listen_init(VLANState *vlan, const char *host_str) { NetSocketListenState *s; - int fd, val, ret; - struct sockaddr_in saddr; - - if (parse_host_port(&saddr, host_str) < 0) - return -1; + int fd, ret; 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); - - /* allow fast reuse */ - val = 1; - setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, (const char *)&val, sizeof(val)); - - ret = bind(fd, (struct sockaddr *)&saddr, sizeof(saddr)); + ret = tcp_server_start(host_str, &fd); if (ret < 0) { - perror("bind"); + fprintf(stderr, "tcp_server_start: %s\n", strerror(ret)); g_free(s); closesocket(fd); return -1; @@ -451,41 +435,19 @@ static int net_socket_connect_init(VLANState *vlan, const char *host_str) { NetSocketState *s; - int fd, connected, ret, err; + int fd, connected, ret; struct sockaddr_in saddr; - if (parse_host_port(&saddr, host_str) < 0) - return -1; - - fd = qemu_socket(PF_INET, SOCK_STREAM, 0); - if (fd < 0) { - perror("socket"); + ret = tcp_client_start(host_str, &fd); + if (ret == -EINPROGRESS || ret == -EWOULDBLOCK) { + connected = 0; + } else if (ret < 0) { + closesocket(fd); return -1; + } else { + connected = 1; } - socket_set_nonblock(fd); - connected = 0; - for(;;) { - ret = connect(fd, (struct sockaddr *)&saddr, sizeof(saddr)); - if (ret < 0) { - err = socket_error(); - if (err == EINTR || err == EWOULDBLOCK) { - } else if (err == EINPROGRESS) { - break; -#ifdef _WIN32 - } else if (err == WSAEALREADY || err == WSAEINVAL) { - break; -#endif - } else { - perror("connect"); - closesocket(fd); - return -1; - } - } else { - connected = 1; - break; - } - } s = net_socket_fd_init(vlan, model, name, fd, connected); if (!s) return -1;