From patchwork Tue Mar 6 22:48:21 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amos Kong X-Patchwork-Id: 145053 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 27F02B6EEA for ; Wed, 7 Mar 2012 10:00:00 +1100 (EST) Received: from localhost ([::1]:51115 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S53By-0005T9-3C for incoming@patchwork.ozlabs.org; Tue, 06 Mar 2012 17:49:14 -0500 Received: from eggs.gnu.org ([208.118.235.92]:43752) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S53BW-0004CU-8x for qemu-devel@nongnu.org; Tue, 06 Mar 2012 17:48:47 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1S53BB-0005kc-Ma for qemu-devel@nongnu.org; Tue, 06 Mar 2012 17:48:45 -0500 Received: from mx1.redhat.com ([209.132.183.28]:35077) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S53BB-0005kF-EC for qemu-devel@nongnu.org; Tue, 06 Mar 2012 17:48:25 -0500 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q26MmN8n007807 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 6 Mar 2012 17:48:23 -0500 Received: from dhcp-8-167.nay.redhat.com (dhcp-8-167.nay.redhat.com [10.66.8.167]) by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id q26MmKYP006796; Tue, 6 Mar 2012 17:48:21 -0500 To: aliguori@us.ibm.com, kvm@vger.kernel.org, quintela@redhat.com, jasowang@redhat.com, qemu-devel@nongnu.org, owasserm@redhat.com, laine@redhat.com From: Amos Kong Date: Wed, 07 Mar 2012 06:48:21 +0800 Message-ID: <20120306224821.24264.50094.stgit@dhcp-8-167.nay.redhat.com> In-Reply-To: <20120306224330.24264.9494.stgit@dhcp-8-167.nay.redhat.com> References: <20120306224330.24264.9494.stgit@dhcp-8-167.nay.redhat.com> User-Agent: StGit/0.15 MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.68 on 10.5.11.25 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v3 5/9] net: refector tcp_*_start functions X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org There are some repeated code for tcp_server_start() and tcp_client_start(). Signed-off-by: Amos Kong --- net.c | 83 ++++++++++++++++++++++++++++++++++++----------------------------- 1 files changed, 46 insertions(+), 37 deletions(-) diff --git a/net.c b/net.c index 9afb0d1..b05c881 100644 --- a/net.c +++ b/net.c @@ -99,38 +99,41 @@ static int get_str_sep(char *buf, int buf_size, const char **pp, int sep) return 0; } -int tcp_server_start(const char *str, int *fd) +static int tcp_server_bind(int fd, struct sockaddr_in *saddr) { - int val, ret; - struct sockaddr_in saddr; + int ret; + int val = 1; - if (parse_host_port(&saddr, str) < 0) { - error_report("invalid host/port combination: %s", str); - return -EINVAL; - } + /* allow fast reuse */ + setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, (const char *)&val, sizeof(val)); - *fd = qemu_socket(PF_INET, SOCK_STREAM, 0); - if (fd < 0) { - perror("socket"); - return -1; + ret = bind(fd, (struct sockaddr *)saddr, sizeof(*saddr)); + + if (ret == -1) { + ret = -socket_error(); } - socket_set_nonblock(*fd); + return ret; - /* allow fast reuse */ - val = 1; - setsockopt(*fd, SOL_SOCKET, SO_REUSEADDR, (const char *)&val, sizeof(val)); +} + +static int tcp_client_connect(int fd, struct sockaddr_in *saddr) +{ + int ret; + + do { + ret = connect(fd, (struct sockaddr *)saddr, sizeof(*saddr)); + if (ret == -1) { + ret = -socket_error(); + } + } while (ret == -EINTR || ret == -EWOULDBLOCK); - ret = bind(*fd, (struct sockaddr *)&saddr, sizeof(saddr)); - if (ret < 0) { - closesocket(*fd); - } return ret; } -int tcp_client_start(const char *str, int *fd) +static int tcp_start_common(const char *str, int *fd, bool server) { + int ret = -EINVAL; struct sockaddr_in saddr; - int ret; *fd = -1; if (parse_host_port(&saddr, str) < 0) { @@ -145,29 +148,35 @@ int tcp_client_start(const char *str, int *fd) } socket_set_nonblock(*fd); - for (;;) { - ret = connect(*fd, (struct sockaddr *)&saddr, sizeof(saddr)); - if (ret < 0) { - ret = -socket_error(); - if (ret == -EINPROGRESS) { - break; + if (server) { + ret = tcp_server_bind(*fd, &saddr); + } else { + ret = tcp_client_connect(*fd, &saddr); + } + #ifdef _WIN32 - } else if (ret == -WSAEALREADY || ret == -WSAEINVAL) { - break; + if (ret == -WSAEALREADY || ret == -WSAEINVAL) { + return ret; /* Success */ + } #endif - } else if (ret != -EINTR && ret != -EWOULDBLOCK) { - perror("connect"); - closesocket(*fd); - return ret; - } - } else { - break; - } + if (ret >= 0 || ret == -EINPROGRESS || ret == -EWOULDBLOCK) { + return ret; /* Success */ } + closesocket(*fd); return ret; } +int tcp_server_start(const char *str, int *fd) +{ + return tcp_start_common(str, fd, true); +} + +int tcp_client_start(const char *str, int *fd) +{ + return tcp_start_common(str, fd, false); +} + int parse_host_port(struct sockaddr_in *saddr, const char *str) { char buf[512];