From patchwork Tue Nov 12 23:06:59 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Yan X-Patchwork-Id: 916 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director10.mail.ord1d.rsapps.net ([172.31.255.6]) by backend30.mail.ord1d.rsapps.net with LMTP id +DauNibWy131SAAAIUCqbw for ; Wed, 13 Nov 2019 05:08:38 -0500 Received: from proxy17.mail.iad3b.rsapps.net ([172.31.255.6]) by director10.mail.ord1d.rsapps.net with LMTP id YKsLNCbWy11DfQAApN4f7A ; Wed, 13 Nov 2019 05:08:38 -0500 Received: from smtp1.gate.iad3b ([172.31.255.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy17.mail.iad3b.rsapps.net with LMTP id OLBSLibWy12qAgAA5ccGVQ ; Wed, 13 Nov 2019 05:08:38 -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: smtp1.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: 8f631aae-05fd-11ea-958c-5254008fd675-1-1 Received: from [216.105.38.7] ([216.105.38.7:49148] helo=lists.sourceforge.net) by smtp1.gate.iad3b.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id 9D/52-17643-626DBCD5; Wed, 13 Nov 2019 05:08:38 -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 1iUpYs-0007kK-HG; Wed, 13 Nov 2019 10:07:42 +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 1iUpYr-0007kB-7x for openvpn-devel@lists.sourceforge.net; Wed, 13 Nov 2019 10:07:41 +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=ibhe8iagioaka1tzM2AZbdnHvwqyJt+yiFETq3dp4fk=; b=NZefiT0OKkPj/g9U1MadxSbC7U jYeHY5c6Tz5LfkwPIMUr6HWgwaIzaeJnkbRp2YasXqL17kqwYnLaAuC/rsqFTp752qGqnOGcnSe6h 5QcoixJGWMlw8laI6mpDw1OH0WmVmuX1x+52rq/Q3FWpestVQBxxBSr5FmpIF7bcWMDQ=; 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=ibhe8iagioaka1tzM2AZbdnHvwqyJt+yiFETq3dp4fk=; b=ZCi035W2O6XxAZiaQ3hBTZfNhH TaQh1BW79TYcaeq3J7pMiPfMjVVIB3tCZ9GqHCd1D5TaKwLcTgBuJioG4EjclE1lyLxVYk6559nZN 4lRkO6lSVm3G/ADaRflf2+b4y6ZSuLkyzDrsPZ2EjQvVppQ1k/CwUEZ27gfZipnx4BQ4=; Received: from mail-pl1-f180.google.com ([209.85.214.180]) by sfi-mx-4.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.92.2) id 1iUpYp-00ExYh-Kc for openvpn-devel@lists.sourceforge.net; Wed, 13 Nov 2019 10:07:41 +0000 Received: by mail-pl1-f180.google.com with SMTP id w8so868519plq.5 for ; Wed, 13 Nov 2019 02:07:39 -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=ibhe8iagioaka1tzM2AZbdnHvwqyJt+yiFETq3dp4fk=; b=Oqhi5Gm4WMrV+sdPEpwtzy3tRgNkwUuGAOLx4mnvGPUZHeDSvNfWvpqbxP+XAEdUdW 7CMW1KKyfHw4tYuug70BYSuXfJXknLLB/Fm7urvcZvjDRNZGFfieilxF8QkpCUhgFwG4 6zfvWkMeeyCEnkJDhxSjxTAwsrohK6nK4Y87ekNach4mPTZzHF63lduCFHfsLF1LsySp 4Zeo39tJrU9TQojgpQng9ksckchUFbHkfTFW7NFpv1xIEPhdH77cL/rngGgwmPgqJoBq xvVX+aO1wFkcrloaM0rAnk9QsU3WmWGvNVwFI0ZzUGv7G0qgIiosFq2tw3TtNdqEvHLJ 36aQ== 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=ibhe8iagioaka1tzM2AZbdnHvwqyJt+yiFETq3dp4fk=; b=WQr7j1g4SMYBV4weUHA6ayjM4iH4IrRL3M5aUWPsibsSDRQLsZfy2QeF+Z3teKvr/u pdeGlZ+LWVJ2dntppOME+gsXc3qODA91CCciWdIlepITBwj/19qbMSGXruSWZF64FAs4 P4bkEK/ukh7enZy3W5YBOPlr6zADDBKzBVvUj969S5lWSufoCBwDi85TkOB3duh2mLdT egFSKwHMagCGOdeVpxPUmQJuEZ3Mgoi0HHbpSwh3ZaemSQHPsvqUGKbHd7Tg0WyqYXlw /wRwUgfkMYh5PgsKZzQE6R5UidNbCqBQ9tTi0PIImjrgzxFIbYqixaCQMSpiKMEEFGNj 1suQ== X-Gm-Message-State: APjAAAVgjRH0HcopK2kdAYgXIHty5L1ik42ozuRFEeGpQwB7/FkVueWS mQCQJCwpBX0U+cR+jf/IeLVjgo31 X-Google-Smtp-Source: APXvYqzOzq4Kb0zLQTd7elXbZwolStTzzw2idFZdLY9c6MdAG7Vf3Bd3AyFQF3CaDem5pdZE8s/OmA== X-Received: by 2002:a17:902:758d:: with SMTP id j13mr2942540pll.55.1573639653427; Wed, 13 Nov 2019 02:07:33 -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.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Nov 2019 02:07:32 -0800 (PST) From: Tom Yan To: openvpn-devel@lists.sourceforge.net Date: Wed, 13 Nov 2019 18:06:59 +0800 Message-Id: <20191113100702.6863-1-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 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.214.180 listed in list.dnswl.org] 0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [209.85.214.180 listed in wl.mailspike.net] -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_WL Mailspike good senders X-Headers-End: 1iUpYp-00ExYh-Kc Subject: [Openvpn-devel] [PATCH v2 1/4] Avoid repeating code for tap and tun+subnet in server directive 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 It also avoids limitation (i.e. netbits <= 29) that does not apply to the subnet topology. --- src/openvpn/helper.c | 74 ++++++++++++++++---------------------------- 1 file changed, 27 insertions(+), 47 deletions(-) diff --git a/src/openvpn/helper.c b/src/openvpn/helper.c index ff9df506..470b9120 100644 --- a/src/openvpn/helper.c +++ b/src/openvpn/helper.c @@ -286,13 +286,13 @@ helper_client_server(struct options *o) print_netmask(IFCONFIG_POOL_MIN_NETBITS, &gc)); } - if (dev == DEV_TYPE_TUN) + if (dev == DEV_TYPE_TUN && (topology == TOP_NET30 || topology == TOP_P2P)) { int pool_end_reserve = 4; if (netbits > 29) { - msg(M_USAGE, "--server directive when used with --dev tun must define a subnet of %s or lower", + msg(M_USAGE, "subnet must be %s or lower", print_netmask(29, &gc)); } @@ -304,66 +304,39 @@ helper_client_server(struct options *o) o->mode = MODE_SERVER; o->tls_server = true; - if (topology == TOP_NET30 || topology == TOP_P2P) + o->ifconfig_local = print_in_addr_t(o->server_network + 1, 0, &o->gc); + o->ifconfig_remote_netmask = print_in_addr_t(o->server_network + 2, 0, &o->gc); + + if (!(o->server_flags & SF_NOPOOL)) { - o->ifconfig_local = print_in_addr_t(o->server_network + 1, 0, &o->gc); - o->ifconfig_remote_netmask = print_in_addr_t(o->server_network + 2, 0, &o->gc); - - if (!(o->server_flags & SF_NOPOOL)) - { - o->ifconfig_pool_defined = true; - o->ifconfig_pool_start = o->server_network + 4; - o->ifconfig_pool_end = (o->server_network | ~o->server_netmask) - pool_end_reserve; - ifconfig_pool_verify_range(M_USAGE, o->ifconfig_pool_start, o->ifconfig_pool_end); - } - - helper_add_route(o->server_network, o->server_netmask, o); - if (o->enable_c2c) - { - push_option(o, print_opt_route(o->server_network, o->server_netmask, &o->gc), M_USAGE); - } - else if (topology == TOP_NET30) - { - push_option(o, print_opt_route(o->server_network + 1, 0, &o->gc), M_USAGE); - } + o->ifconfig_pool_defined = true; + o->ifconfig_pool_start = o->server_network + 4; + o->ifconfig_pool_end = (o->server_network | ~o->server_netmask) - pool_end_reserve; + ifconfig_pool_verify_range(M_USAGE, o->ifconfig_pool_start, o->ifconfig_pool_end); } - else if (topology == TOP_SUBNET) + + helper_add_route(o->server_network, o->server_netmask, o); + if (o->enable_c2c) { - o->ifconfig_local = print_in_addr_t(o->server_network + 1, 0, &o->gc); - o->ifconfig_remote_netmask = print_in_addr_t(o->server_netmask, 0, &o->gc); - - if (!(o->server_flags & SF_NOPOOL)) - { - o->ifconfig_pool_defined = true; - o->ifconfig_pool_start = o->server_network + 2; - o->ifconfig_pool_end = (o->server_network | ~o->server_netmask) - 2; - ifconfig_pool_verify_range(M_USAGE, o->ifconfig_pool_start, o->ifconfig_pool_end); - } - o->ifconfig_pool_netmask = o->server_netmask; - - push_option(o, print_opt_route_gateway(o->server_network + 1, &o->gc), M_USAGE); - if (!o->route_default_gateway) - { - o->route_default_gateway = print_in_addr_t(o->server_network + 2, 0, &o->gc); - } + push_option(o, print_opt_route(o->server_network, o->server_netmask, &o->gc), M_USAGE); } - else + else if (topology == TOP_NET30) { - ASSERT(0); + push_option(o, print_opt_route(o->server_network + 1, 0, &o->gc), M_USAGE); } - push_option(o, print_opt_topology(topology, &o->gc), M_USAGE); } - else if (dev == DEV_TYPE_TAP) + else if (dev == DEV_TYPE_TAP || (dev == DEV_TYPE_TUN && topology == TOP_SUBNET)) { if (netbits > 30) { - msg(M_USAGE, "--server directive when used with --dev tap must define a subnet of %s or lower", + msg(M_USAGE, "subnet must be %s or lower", print_netmask(30, &gc)); } o->mode = MODE_SERVER; o->tls_server = true; + o->ifconfig_local = print_in_addr_t(o->server_network + 1, 0, &o->gc); o->ifconfig_remote_netmask = print_in_addr_t(o->server_netmask, 0, &o->gc); @@ -371,18 +344,25 @@ helper_client_server(struct options *o) { o->ifconfig_pool_defined = true; o->ifconfig_pool_start = o->server_network + 2; - o->ifconfig_pool_end = (o->server_network | ~o->server_netmask) - 1; + o->ifconfig_pool_end = (o->server_network | ~o->server_netmask) - 2; ifconfig_pool_verify_range(M_USAGE, o->ifconfig_pool_start, o->ifconfig_pool_end); } o->ifconfig_pool_netmask = o->server_netmask; push_option(o, print_opt_route_gateway(o->server_network + 1, &o->gc), M_USAGE); + if (dev == DEV_TYPE_TUN && !o->route_default_gateway) + { + o->route_default_gateway = print_in_addr_t(o->server_network + 2, 0, &o->gc); + } } else { ASSERT(0); } + if (dev == DEV_TYPE_TUN) + push_option(o, print_opt_topology(topology, &o->gc), M_USAGE); + /* set push-ifconfig-constraint directive */ if ((dev == DEV_TYPE_TAP || topology == TOP_SUBNET)) {