From patchwork Tue Nov 12 23:07:02 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Yan X-Patchwork-Id: 914 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director9.mail.ord1d.rsapps.net ([172.31.255.6]) by backend30.mail.ord1d.rsapps.net with LMTP id 6NW4GiTWy12pAwAAIUCqbw for ; Wed, 13 Nov 2019 05:08:36 -0500 Received: from proxy12.mail.iad3b.rsapps.net ([172.31.255.6]) by director9.mail.ord1d.rsapps.net with LMTP id WDRRGCTWy11wAgAAalYnBA ; Wed, 13 Nov 2019 05:08:36 -0500 Received: from smtp26.gate.iad3b ([172.31.255.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy12.mail.iad3b.rsapps.net with LMTP id 8H6iESTWy12RbgAAEsW3lA ; Wed, 13 Nov 2019 05:08:36 -0500 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: smtp26.gate.iad3b.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; dkim=fail (signature verification failed) header.d=gmail.com; dmarc=fail (p=none; dis=none) header.from=gmail.com X-Suspicious-Flag: YES X-Classification-ID: 8de4141c-05fd-11ea-9e14-5254001088d3-1-1 Received: from [216.105.38.7] ([216.105.38.7:49132] helo=lists.sourceforge.net) by smtp26.gate.iad3b.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id AD/14-13579-326DBCD5; Wed, 13 Nov 2019 05:08:36 -0500 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 1iUpYw-0007kv-KY; Wed, 13 Nov 2019 10:07:46 +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 1iUpYv-0007ko-SC for openvpn-devel@lists.sourceforge.net; Wed, 13 Nov 2019 10:07:45 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=Content-Transfer-Encoding:MIME-Version:References: In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type: 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=KUhNovZvfxVyeK82GPDDYycCnq9oSqytZJi5V0ZHq7U=; b=Dc3/Fk297G63bUeRj08LJW1ysF g5s+e3ZFQF7HwUTQ/K4Bsw1aZuSQYQu55U4HjN5I+nJuPNuifwYYTEm7hGOoh2fhkItjTBpw/PpF7 JcGM7aFtDZZQnzeqetasBzePYuyIQfI6i+8M5ZlBDzcMVCzshmOB9u/Tc8AqPothABGk=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To:Message-Id: Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type: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=KUhNovZvfxVyeK82GPDDYycCnq9oSqytZJi5V0ZHq7U=; b=M2JtVeXHUoaoyDFWm00y3e2B9V 1uP3CKYLRfiMoSvSrOvGV6Rg1kKVGg5UKf1l4fVfMc61ofq8xZOL9+mJ/HpXHMZgczeeedgK3opoC iYIMMVngpGoVUIljqHwhUew7GG0A0qC/wuxm7dIuDd6FkwBT5dNxueyVjfw9//JdzbCA=; Received: from mail-pf1-f170.google.com ([209.85.210.170]) by sfi-mx-4.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.92.2) id 1iUpYu-00ExZ4-4T for openvpn-devel@lists.sourceforge.net; Wed, 13 Nov 2019 10:07:45 +0000 Received: by mail-pf1-f170.google.com with SMTP id q26so1309276pfn.11 for ; Wed, 13 Nov 2019 02:07:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=KUhNovZvfxVyeK82GPDDYycCnq9oSqytZJi5V0ZHq7U=; b=LsHUe1PqbezJMEzAG5mGHuArdmLVziNBC4pzAtsgKa+O2n4TISTcSHm2aNkOggo7fw QPPl+ucwCZUSdeEqfspriXXu9Do742qbI64+YTj544LSVDhfATdfovvLzzlDvLQ4FqGv vsL2BFcaGbn/OVnLvvLNXx1FJYiGvHzxmsLJ2fvTFGOiQCN7MNHBj/17LOvkigm1gXlg k9T+7CwnK1hK5lCFZb16UycQZVwQJdHmxzT+hjCIm6gTnUQdTOdeA/6qUCwn4KYbsN8+ +x4gH0hJlMsxcUY8yGzeQkTeLND6OLH3LymA4MUH9Z3xm800XnsNN/7uQ0CAxC5Fdy+f 6iWQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=KUhNovZvfxVyeK82GPDDYycCnq9oSqytZJi5V0ZHq7U=; b=tCNHpqUrP6x3X8nK7LoUmSqJlRutW0koSIHhUKSjJHpiM5+08FrhR4dIfV5Qwgdim9 gcB1rQoR6AjxaOpCilRVbO0zISBCKLsOSXtfxwAc8Yf0qnuvKR6qijXRALcTFAhz5z5L jlGZQxjxTq1CgnAi8ssfw1+/5k/fvb2wVayHxRKfa2fAsrrN9Z6BjRn9BxXSgyf/iH0C /6UyAmJinLknM2RBAvHjaqCxMFoSftnYzlXNi6v8p8sOzGqo539Qbcs8V5EPPvc71UNe 4kBmncPl6/+daophFbQqK4vDcNs17P+4GNKuF1q+2ipmakYEbZnGEcuymk/JLEuhfji3 uZ5g== X-Gm-Message-State: APjAAAUOXlCnXXCl6XNWj5chne6XL55hmB3w1yc4yELT7JqPwtN7baoD 8bqbe51omVDGfmnFfxAwRpypxHWq X-Google-Smtp-Source: APXvYqxjBX+OuZ5IV62FQig+QyBC8ovT/vzi5MDL7fIRuoYoPvtS0hY1s6IGuH4/XQ0D8xXoN1wpkA== X-Received: by 2002:a63:6782:: with SMTP id b124mr2851102pgc.220.1573639658116; Wed, 13 Nov 2019 02:07:38 -0800 (PST) Received: from localhost.localdomain (123202047155.ctinets.com. [123.202.47.155]) by smtp.gmail.com with ESMTPSA id d6sm2113297pfn.32.2019.11.13.02.07.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Nov 2019 02:07:37 -0800 (PST) From: Tom Yan To: openvpn-devel@lists.sourceforge.net Date: Wed, 13 Nov 2019 18:07:02 +0800 Message-Id: <20191113100702.6863-4-tom.ty89@gmail.com> X-Mailer: git-send-email 2.24.0 In-Reply-To: <61c1b837-3f81-6783-5934-8128bb81881b@unstable.cc> References: <61c1b837-3f81-6783-5934-8128bb81881b@unstable.cc> MIME-Version: 1.0 X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. See http://spamassassin.org/tag/ for more details. 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (tom.ty89[at]gmail.com) -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.2 FREEMAIL_ENVFROM_END_DIGIT Envelope-from freemail username ends in digit (tom.ty89[at]gmail.com) -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid 0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [209.85.210.170 listed in wl.mailspike.net] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.210.170 listed in list.dnswl.org] 0.0 RCVD_IN_MSPIKE_WL Mailspike good senders X-Headers-End: 1iUpYu-00ExZ4-4T Subject: [Openvpn-devel] [PATCH v2 4/4] Do not set pool netmask when nopool is set 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: , Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox The setting probably just slipped out of the if-block over rewrites. --- src/openvpn/helper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/openvpn/helper.c b/src/openvpn/helper.c index 6e2f0891..a36bc63a 100644 --- a/src/openvpn/helper.c +++ b/src/openvpn/helper.c @@ -351,8 +351,8 @@ helper_client_server(struct options *o) o->ifconfig_pool_start = o->server_network + ptp + 1; o->ifconfig_pool_end = (o->server_network | ~o->server_netmask) - ptp; ifconfig_pool_verify_range(M_USAGE, o->ifconfig_pool_start, o->ifconfig_pool_end); + o->ifconfig_pool_netmask = o->server_netmask; } - o->ifconfig_pool_netmask = o->server_netmask; push_option(o, print_opt_route_gateway(o->server_network + ptp, &o->gc), M_USAGE); if (dev == DEV_TYPE_TUN && !o->route_default_gateway)