{"id":810039,"url":"http://patchwork.ozlabs.org/api/patches/810039/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170905092230.8243-4-berrange@redhat.com/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20170905092230.8243-4-berrange@redhat.com>","list_archive_url":null,"date":"2017-09-05T09:22:24","name":"[PULL,v1,3/9] sockets: factor out a new try_bind() function","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"601a180baf6b330740e48ddbf09e4e8743114197","submitter":{"id":2694,"url":"http://patchwork.ozlabs.org/api/people/2694/?format=json","name":"Daniel P. Berrangé","email":"berrange@redhat.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170905092230.8243-4-berrange@redhat.com/mbox/","series":[{"id":1527,"url":"http://patchwork.ozlabs.org/api/series/1527/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=1527","date":"2017-09-05T09:22:21","name":"[PULL,v1,1/9] io: fix temp directory used by test-io-channel-tls test","version":1,"mbox":"http://patchwork.ozlabs.org/series/1527/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/810039/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/810039/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=nongnu.org\n\t(client-ip=2001:4830:134:3::11; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=)","ext-mx02.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx02.extmail.prod.ext.phx2.redhat.com;\n\tspf=fail smtp.mailfrom=berrange@redhat.com"],"Received":["from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11])\n\t(using TLSv1 with cipher AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xmhCp1tNyz9s75\n\tfor ;\n\tTue, 5 Sep 2017 19:25:58 +1000 (AEST)","from localhost ([::1]:57676 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dpA7I-0003Qz-7S\n\tfor incoming@patchwork.ozlabs.org; Tue, 05 Sep 2017 05:25:56 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:41148)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dpA4C-00018w-9n\n\tfor qemu-devel@nongnu.org; Tue, 05 Sep 2017 05:22:49 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dpA47-0002hQ-Di\n\tfor qemu-devel@nongnu.org; Tue, 05 Sep 2017 05:22:44 -0400","from mx1.redhat.com ([209.132.183.28]:54766)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from ) id 1dpA47-0002h3-5Y\n\tfor qemu-devel@nongnu.org; Tue, 05 Sep 2017 05:22:39 -0400","from smtp.corp.redhat.com\n\t(int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby mx1.redhat.com (Postfix) with ESMTPS id 3A8EC806A0;\n\tTue, 5 Sep 2017 09:22:38 +0000 (UTC)","from t460.redhat.com (unknown [10.33.36.63])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id 5039360BEC;\n\tTue, 5 Sep 2017 09:22:37 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 3A8EC806A0","From":"\"Daniel P. Berrange\" ","To":"qemu-devel@nongnu.org","Date":"Tue, 5 Sep 2017 10:22:24 +0100","Message-Id":"<20170905092230.8243-4-berrange@redhat.com>","In-Reply-To":"<20170905092230.8243-1-berrange@redhat.com>","References":"<20170905092230.8243-1-berrange@redhat.com>","X-Scanned-By":"MIMEDefang 2.79 on 10.5.11.13","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.26]);\n\tTue, 05 Sep 2017 09:22:38 +0000 (UTC)","X-detected-operating-system":"by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]\n\t[fuzzy]","X-Received-From":"209.132.183.28","Subject":"[Qemu-devel] [PULL v1 3/9] sockets: factor out a new try_bind()\n\tfunction","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"Peter Maydell ,\n\tKnut Omang ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"content":"From: Knut Omang \n\nA refactoring step to prepare for the problem\nexposed by the test-listen test in the previous commit.\n\nSimplify and reorganize the IPv6 specific extra\nmeasures and move it out of the for loop to increase\ncode readability. No semantic changes.\n\nSigned-off-by: Knut Omang \nReviewed-by: Daniel P. Berrange \nSigned-off-by: Daniel P. Berrange \n---\n util/qemu-sockets.c | 69 ++++++++++++++++++++++++++++++-----------------------\n 1 file changed, 39 insertions(+), 30 deletions(-)","diff":"diff --git a/util/qemu-sockets.c b/util/qemu-sockets.c\nindex 1358c81bcc..b4a2f243f4 100644\n--- a/util/qemu-sockets.c\n+++ b/util/qemu-sockets.c\n@@ -149,6 +149,44 @@ int inet_ai_family_from_address(InetSocketAddress *addr,\n return PF_UNSPEC;\n }\n \n+static int try_bind(int socket, InetSocketAddress *saddr, struct addrinfo *e)\n+{\n+#ifndef IPV6_V6ONLY\n+ return bind(socket, e->ai_addr, e->ai_addrlen);\n+#else\n+ /*\n+ * Deals with first & last cases in matrix in comment\n+ * for inet_ai_family_from_address().\n+ */\n+ int v6only =\n+ ((!saddr->has_ipv4 && !saddr->has_ipv6) ||\n+ (saddr->has_ipv4 && saddr->ipv4 &&\n+ saddr->has_ipv6 && saddr->ipv6)) ? 0 : 1;\n+ int stat;\n+\n+ rebind:\n+ if (e->ai_family == PF_INET6) {\n+ qemu_setsockopt(socket, IPPROTO_IPV6, IPV6_V6ONLY, &v6only,\n+ sizeof(v6only));\n+ }\n+\n+ stat = bind(socket, e->ai_addr, e->ai_addrlen);\n+ if (!stat) {\n+ return 0;\n+ }\n+\n+ /* If we got EADDRINUSE from an IPv6 bind & v6only is unset,\n+ * it could be that the IPv4 port is already claimed, so retry\n+ * with v6only set\n+ */\n+ if (e->ai_family == PF_INET6 && errno == EADDRINUSE && !v6only) {\n+ v6only = 1;\n+ goto rebind;\n+ }\n+ return stat;\n+#endif\n+}\n+\n static int inet_listen_saddr(InetSocketAddress *saddr,\n int port_offset,\n bool update_addr,\n@@ -228,39 +266,10 @@ static int inet_listen_saddr(InetSocketAddress *saddr,\n port_min = inet_getport(e);\n port_max = saddr->has_to ? saddr->to + port_offset : port_min;\n for (p = port_min; p <= port_max; p++) {\n-#ifdef IPV6_V6ONLY\n- /*\n- * Deals with first & last cases in matrix in comment\n- * for inet_ai_family_from_address().\n- */\n- int v6only =\n- ((!saddr->has_ipv4 && !saddr->has_ipv6) ||\n- (saddr->has_ipv4 && saddr->ipv4 &&\n- saddr->has_ipv6 && saddr->ipv6)) ? 0 : 1;\n-#endif\n inet_setport(e, p);\n-#ifdef IPV6_V6ONLY\n- rebind:\n- if (e->ai_family == PF_INET6) {\n- qemu_setsockopt(slisten, IPPROTO_IPV6, IPV6_V6ONLY, &v6only,\n- sizeof(v6only));\n- }\n-#endif\n- if (bind(slisten, e->ai_addr, e->ai_addrlen) == 0) {\n+ if (try_bind(slisten, saddr, e) >= 0) {\n goto listen;\n }\n-\n-#ifdef IPV6_V6ONLY\n- /* If we got EADDRINUSE from an IPv6 bind & V6ONLY is unset,\n- * it could be that the IPv4 port is already claimed, so retry\n- * with V6ONLY set\n- */\n- if (e->ai_family == PF_INET6 && errno == EADDRINUSE && !v6only) {\n- v6only = 1;\n- goto rebind;\n- }\n-#endif\n-\n if (p == port_max) {\n if (!e->ai_next) {\n error_setg_errno(errp, errno, \"Failed to bind socket\");\n","prefixes":["PULL","v1","3/9"]}