From patchwork Tue Nov 12 21:58:54 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Yan X-Patchwork-Id: 913 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director8.mail.ord1d.rsapps.net ([172.27.255.57]) by backend30.mail.ord1d.rsapps.net with LMTP id GGnGF1LGy12hWwAAIUCqbw for ; Wed, 13 Nov 2019 04:01:06 -0500 Received: from proxy2.mail.iad3a.rsapps.net ([172.27.255.57]) by director8.mail.ord1d.rsapps.net with LMTP id 6ADBFFLGy12eBAAAfY0hYg ; Wed, 13 Nov 2019 04:01:06 -0500 Received: from smtp34.gate.iad3a ([172.27.255.57]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy2.mail.iad3a.rsapps.net with LMTP id GMRhDVLGy13KPgAABcWvHw ; Wed, 13 Nov 2019 04:01:06 -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: 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; 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: 1fcd2698-05f4-11ea-aae4-525400865cc7-1-1 Received: from [216.105.38.7] ([216.105.38.7:55778] helo=lists.sourceforge.net) by smtp34.gate.iad3a.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id 24/31-24997-156CBCD5; Wed, 13 Nov 2019 04:01:06 -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 1iUoV0-0004GF-GI; Wed, 13 Nov 2019 08:59:38 +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 1iUoUx-0004G0-HI for openvpn-devel@lists.sourceforge.net; Wed, 13 Nov 2019 08:59:35 +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: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:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=nmfGQs091/RAHjDtfLzQNmkcCDWIs8L7uz+b6NH1+8k=; b=N/ypInZGV8bYnfIr+m27/usE0Y ZYhu1jW4wdxRHo7ZOc8J3hQyewAfmiJSTKRt1MejsH70f3JqmbWg3YOb/rXiEmXPnbzyukzzGnwTN p0M4wfxnCZ/ZyUfzAR+QBc7ujIVSDjODWu/Wrtm+uCCMbG0oYA/7GeTjtaDOxoxFRgrI=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Content-Transfer-Encoding:MIME-Version: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:In-Reply-To: References:List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post: List-Owner:List-Archive; bh=nmfGQs091/RAHjDtfLzQNmkcCDWIs8L7uz+b6NH1+8k=; b=D IGMpNac4DddnwIU0lH9yNGhXqV3Ukt/IRq4onMDEUH8ahXkWY5tjS/fR3rS4txz6xbnlLCBCf5jB1 Dcq+fs3nnpOqz2ytKRnQbbWYscXjVsmmk77vGgpLhWzhYbbaAGbPK71w8tNIwidXjNASoy80Kzmtx UOXt3W/cVe+KUGNw=; Received: from mail-pg1-f173.google.com ([209.85.215.173]) by sfi-mx-3.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.92.2) id 1iUoUt-00EiWv-Dc for openvpn-devel@lists.sourceforge.net; Wed, 13 Nov 2019 08:59:35 +0000 Received: by mail-pg1-f173.google.com with SMTP id r18so940296pgu.13 for ; Wed, 13 Nov 2019 00:59:31 -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:mime-version :content-transfer-encoding; bh=nmfGQs091/RAHjDtfLzQNmkcCDWIs8L7uz+b6NH1+8k=; b=ql+YpXMd0jnwsb5GSH/DOqyjsSYQGnl6mVth7lZs9N+SlTUtkgaPPn3iNwSp0jN/1s IPwMIporQH4ZkiPkzJjVEkco/G055fZjIhobpOJBtwYXpa8JliMe3mdat34xnM4ED+xf MUIxXZQpbkoHWyEY9kQJSJBNpIx8Z/vI9XRZRC14JfWluanIq4AHhHq3HdCdwnTrnvRK EAhbnWvOE6sTfICvHxC1sE5kF4EJf6QdAe6jIMPeVNvtlI/gSrolIUb70IBu2yK4l5jN N5sVwqcCaTZ6Wu4BbdYBv0zCMcxpdA4mky2osouGViD34Xlp9p2vvaVPlA5F6MTSlqyG TQow== 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:mime-version :content-transfer-encoding; bh=nmfGQs091/RAHjDtfLzQNmkcCDWIs8L7uz+b6NH1+8k=; b=LQBYDOJHR00sJd8ug7Rsee2J0dwqfXF2nXdw+WJ6lZa8oK3nw7H3ZE+b9/kIwfSe5z 6NhC/Sj3TLcb9AfGTDOm7EUNxnrJ17ANSOwH1buhdyVx1D6fqNp0LJwFvY2bTNH3okjZ CdZJd1pE30/Hpx9nZiheNWDUkAXJaTssPiBwzHX8IiQwrFmolhQTSJmO7qkIImb9vSBn 69fPrWaHRl84JAFDiqwE1JOFc17b5y1TCJWpTkBSA5uE8hoQG7LPRiK8MPVwCyDYeBJU Y7y7RnrqJyXvkjgDfGZxO/j9Ix3jn9aCZzwvbWYA3vVMXdKAe9OBtdVfrWBKCkxCuwIK UzBQ== X-Gm-Message-State: APjAAAUOhU3YQJnKJhoG9k7oxUcs7lGBT3m6zYYU0qkGk6QkKXUk5CNA Ztyznf5+K9axZMuFJxfHNQyrbWrk X-Google-Smtp-Source: APXvYqzjjKOscnbMQRX2mP7A61d3w35zosUYoH9Y8B6S15z1ix94S9IblMKfy8BjOKT5p+yfXYvlHA== X-Received: by 2002:a17:90a:eb18:: with SMTP id j24mr3401786pjz.85.1573635565303; Wed, 13 Nov 2019 00:59:25 -0800 (PST) Received: from localhost.localdomain (123202047155.ctinets.com. [123.202.47.155]) by smtp.gmail.com with ESMTPSA id s23sm1765421pgh.21.2019.11.13.00.59.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Nov 2019 00:59:24 -0800 (PST) From: Tom Yan To: openvpn-devel@lists.sourceforge.net Date: Wed, 13 Nov 2019 16:58:54 +0800 Message-Id: <20191113085854.6016-1-tom.ty89@gmail.com> X-Mailer: git-send-email 2.24.0 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.215.173 listed in list.dnswl.org] 0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [209.85.215.173 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: 1iUoUt-00EiWv-Dc Subject: [Openvpn-devel] [PATCH] Fix server directive for /31 subnet 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 As /31 subnet now works (as we stop setting broadcast address), the server directives can be fixed for it as well. Also stop repeating code for tap and tun + subnet. --- src/openvpn/helper.c | 90 ++++++++++++++++++-------------------------- 1 file changed, 37 insertions(+), 53 deletions(-) diff --git a/src/openvpn/helper.c b/src/openvpn/helper.c index ff9df506..608f886f 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,85 +304,69 @@ 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) + int ptp = 1; + + if (netbits > 31) { - msg(M_USAGE, "--server directive when used with --dev tap must define a subnet of %s or lower", - print_netmask(30, &gc)); + msg(M_USAGE, "subnet must be %s or lower", + print_netmask(31, &gc)); } + if (netbits == 31) + ptp = 0; + o->mode = MODE_SERVER; o->tls_server = true; - o->ifconfig_local = print_in_addr_t(o->server_network + 1, 0, &o->gc); + + o->ifconfig_local = print_in_addr_t(o->server_network + ptp, 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) - 1; + 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; - push_option(o, print_opt_route_gateway(o->server_network + 1, &o->gc), M_USAGE); + push_option(o, print_opt_route_gateway(o->server_network + ptp, &o->gc), M_USAGE); + if (dev == DEV_TYPE_TUN && !o->route_default_gateway) + { + o->route_default_gateway = print_in_addr_t(o->server_network + ptp + 1, 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)) {