From patchwork Wed Oct 2 10:23:14 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sebastian Ottlik X-Patchwork-Id: 279683 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 038C12C0094 for ; Wed, 2 Oct 2013 20:26:55 +1000 (EST) Received: from localhost ([::1]:35191 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VRJds-0006Gw-Sc for incoming@patchwork.ozlabs.org; Wed, 02 Oct 2013 06:26:52 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56434) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VRJbE-0002KQ-Mr for qemu-devel@nongnu.org; Wed, 02 Oct 2013 06:24:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VRJb3-0005jH-Hh for qemu-devel@nongnu.org; Wed, 02 Oct 2013 06:24:08 -0400 Received: from mailhost.fzi.de ([141.21.8.250]:8567 helo=EX-E-1.perimeter.fzi.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VRJb3-0005j4-86 for qemu-devel@nongnu.org; Wed, 02 Oct 2013 06:23:57 -0400 Received: from ex-ca-ht-1.fzi.de (141.21.32.98) by EX-E-1.perimeter.fzi.de (141.21.8.250) with Microsoft SMTP Server (TLS) id 14.2.347.0; Wed, 2 Oct 2013 12:23:52 +0200 Received: from orcrist.fzi.de (141.21.45.20) by ex-ca-ht-1.fzi.de (141.21.32.98) with Microsoft SMTP Server id 14.3.158.1; Wed, 2 Oct 2013 12:23:56 +0200 Received: by orcrist.fzi.de (Postfix, from userid 330838105) id 1AFED1C072C; Wed, 2 Oct 2013 12:23:56 +0200 (CEST) From: Sebastian Ottlik To: Date: Wed, 2 Oct 2013 12:23:14 +0200 Message-ID: <1380709396-6063-4-git-send-email-ottlik@fzi.de> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1380709396-6063-1-git-send-email-ottlik@fzi.de> References: <1380709396-6063-1-git-send-email-ottlik@fzi.de> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 141.21.8.250 Cc: aliguori@us.ibm.com, jan.kiszka@siemens.com, ottlik@fzi.de, stefanha@redhat.com, sw@weilnetz.de Subject: [Qemu-devel] [PATCH v6 3/5] net: call socket_set_fast_reuse instead of setting SO_REUSEADDR 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 SO_REUSEADDR should be avoided on Windows but is desired on other operating systems. So instead of setting it we call socket_set_fast_reuse that will result in the appropriate behaviour on all operating systems. An exception to this rule are multicast sockets where it is sensible to have multiple sockets listen on the same ip and port and we should set SO_REUSEADDR on windows. Signed-off-by: Sebastian Ottlik --- net/socket.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/net/socket.c b/net/socket.c index e61309d..fb21e20 100644 --- a/net/socket.c +++ b/net/socket.c @@ -262,6 +262,11 @@ static int net_socket_mcast_create(struct sockaddr_in *mcastaddr, struct in_addr return -1; } + /* Allow multiple sockets to bind the same multicast ip and port by setting + * SO_REUSEADDR. This is the only situation where SO_REUSEADDR should be set + * on windows. Use socket_set_fast_reuse otherwise as it sets SO_REUSEADDR + * only on posix systems. + */ val = 1; ret = qemu_setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &val, sizeof(val)); if (ret < 0) { @@ -510,7 +515,7 @@ static int net_socket_listen_init(NetClientState *peer, NetClientState *nc; NetSocketState *s; struct sockaddr_in saddr; - int fd, val, ret; + int fd, ret; if (parse_host_port(&saddr, host_str) < 0) return -1; @@ -522,9 +527,7 @@ static int net_socket_listen_init(NetClientState *peer, } qemu_set_nonblock(fd); - /* allow fast reuse */ - val = 1; - qemu_setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &val, sizeof(val)); + socket_set_fast_reuse(fd); ret = bind(fd, (struct sockaddr *)&saddr, sizeof(saddr)); if (ret < 0) { @@ -645,7 +648,7 @@ static int net_socket_udp_init(NetClientState *peer, const char *lhost) { NetSocketState *s; - int fd, val, ret; + int fd, ret; struct sockaddr_in laddr, raddr; if (parse_host_port(&laddr, lhost) < 0) { @@ -661,11 +664,9 @@ static int net_socket_udp_init(NetClientState *peer, perror("socket(PF_INET, SOCK_DGRAM)"); return -1; } - val = 1; - ret = qemu_setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, - &val, sizeof(val)); + + ret = socket_set_fast_reuse(fd); if (ret < 0) { - perror("setsockopt(SOL_SOCKET, SO_REUSEADDR)"); closesocket(fd); return -1; }