From patchwork Wed Apr 25 09:57:20 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Antonio Quartulli X-Patchwork-Id: 325 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director11.mail.ord1d.rsapps.net ([172.27.255.1]) by backend30.mail.ord1d.rsapps.net (Dovecot) with LMTP id S8/ADj3e4FqcWAAAIUCqbw for ; Wed, 25 Apr 2018 15:59:57 -0400 Received: from proxy6.mail.iad3a.rsapps.net ([172.27.255.1]) by director11.mail.ord1d.rsapps.net (Dovecot) with LMTP id 04YjCD3e4FozOAAAvGGmqA ; Wed, 25 Apr 2018 15:59:57 -0400 Received: from smtp34.gate.iad3a ([172.27.255.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy6.mail.iad3a.rsapps.net with LMTP id sK3dBT3e4FqPbQAA8udqhg ; Wed, 25 Apr 2018 15:59:57 -0400 X-Spam-Threshold: 95 X-Spam-Score: 0 X-Spam-Flag: NO X-Virus-Scanned: OK X-Orig-To: openvpnslackdevel@openvpn.net X-Originating-Ip: [216.105.38.7] Authentication-Results: smtp34.gate.iad3a.rsapps.net; iprev=pass policy.iprev="216.105.38.7"; spf=pass smtp.mailfrom="openvpn-devel-bounces@lists.sourceforge.net" smtp.helo="lists.sourceforge.net"; dkim=fail (signature verification failed) header.d=sourceforge.net; dkim=fail (signature verification failed) header.d=sf.net; dmarc=none (p=nil; dis=none) header.from=unstable.cc X-Suspicious-Flag: YES X-Classification-ID: 39c00eac-48c3-11e8-b24d-525400865cc7-1-1 Received: from [216.105.38.7] ([216.105.38.7:39475] helo=lists.sourceforge.net) by smtp34.gate.iad3a.rsapps.net (envelope-from ) (ecelerity 4.2.1.56364 r(Core:4.2.1.14)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id 82/AC-03217-C3ED0EA5; Wed, 25 Apr 2018 15:59:56 -0400 Received: from [127.0.0.1] (helo=sfs-ml-2.v29.lw.sourceforge.com) by sfs-ml-2.v29.lw.sourceforge.com with esmtp (Exim 4.90_1) (envelope-from ) id 1fBQZG-00017t-V0; Wed, 25 Apr 2018 19:59:06 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-2.v29.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.90_1) (envelope-from ) id 1fBQZF-00017d-Gi for openvpn-devel@lists.sourceforge.net; Wed, 25 Apr 2018 19:59:05 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=References:In-Reply-To:Message-Id:Date:Subject:Cc: To:From:Sender:Reply-To:MIME-Version:Content-Type:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=bfDuMYy+lNV8OKfV/j0KlWI8aAr6esWeb2hiXOdCxQ8=; b=k5PDgOZ/1byH6jKNyZfYaPdFKI vgWbi1f12GdQb0erx7nD3tIHEoUiBT6fokJjly8Ckv96gBUn1MJvC/Q5P7hzauSB0kWU1kZ0EHdKS iZGomLtmwZ/x2qnI2zHn0v+fW2hp+HvdH2vTaLdFC3t1rWbaBRG2/jaiu3WQWtuEOjRs=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To :MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=bfDuMYy+lNV8OKfV/j0KlWI8aAr6esWeb2hiXOdCxQ8=; b=KvkFGNmk2paPQx4DERaoC2T2B3 qT0MOWqG9EXwsDnUZ8giNrrsA8GuSegyVhdot/FTUyJVweRVXIi//UTDiGbbSl/gz5lOzg5VRK+VV yLsrfqtaYK6BmZWdvlAFmLy8bW+qf8LLyoU1ZXQabO07tp1cIofph1EJ4Spw0uVuPPGg=; Received: from s2.neomailbox.net ([5.148.176.60]) by sfi-mx-1.v28.lw.sourceforge.com with esmtps (TLSv1.2:DHE-RSA-AES256-GCM-SHA384:256) (Exim 4.90_1) id 1fBQZE-009L9F-36 for openvpn-devel@lists.sourceforge.net; Wed, 25 Apr 2018 19:59:05 +0000 From: Antonio Quartulli To: openvpn-devel@lists.sourceforge.net Date: Thu, 26 Apr 2018 03:57:20 +0800 Message-Id: <20180425195722.20744-7-a@unstable.cc> In-Reply-To: <20180425195722.20744-1-a@unstable.cc> References: <20180425195722.20744-1-a@unstable.cc> X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. See http://spamassassin.org/tag/ for more details. -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [5.148.176.60 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record X-Headers-End: 1fBQZE-009L9F-36 Subject: [Openvpn-devel] [RFC 6/8] if a local IPv6 address is provided, socket must be v6-only X-BeenThere: openvpn-devel@lists.sourceforge.net X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Antonio Quartulli MIME-Version: 1.0 Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox Signed-off-by: Antonio Quartulli --- src/openvpn/socket.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/openvpn/socket.c b/src/openvpn/socket.c index 84d828e6..79fbc6a8 100644 --- a/src/openvpn/socket.c +++ b/src/openvpn/socket.c @@ -988,9 +988,15 @@ bind_local(struct link_socket *sock, const sa_family_t ai_family) } else { + bool v6only = sock->info.bind_ipv6_only; + + /* force binding IPv6-only if an address was specified + * an it is a IPv6 */ + if (sock->local_host && ai_family == AF_INET6) + v6only = true; + socket_bind(sock->sd, sock->info.lsa->bind_local, - ai_family, - "TCP/UDP", sock->info.bind_ipv6_only); + ai_family, "TCP/UDP", v6only); } } }