From patchwork Tue Nov 12 23:07:00 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Yan X-Patchwork-Id: 915 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 gHtjFCbWy128SgAAIUCqbw for ; Wed, 13 Nov 2019 05:08:38 -0500 Received: from proxy16.mail.iad3b.rsapps.net ([172.31.255.6]) by director10.mail.ord1d.rsapps.net with LMTP id WOUfESbWy11+fwAApN4f7A ; Wed, 13 Nov 2019 05:08:38 -0500 Received: from smtp15.gate.iad3b ([172.31.255.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy16.mail.iad3b.rsapps.net with LMTP id qFYoCybWy11oUwAAPj+4aA ; 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: smtp15.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: 8ef6f8ba-05fd-11ea-aa4e-5254003d6d3a-1-1 Received: from [216.105.38.7] ([216.105.38.7:52932] helo=lists.sourceforge.net) by smtp15.gate.iad3b.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id 8A/A0-23696-526DBCD5; Wed, 13 Nov 2019 05:08:38 -0500 Received: from [127.0.0.1] (helo=sfs-ml-4.v29.lw.sourceforge.com) by sfs-ml-4.v29.lw.sourceforge.com with esmtp (Exim 4.90_1) (envelope-from ) id 1iUpYv-0001uA-5d; Wed, 13 Nov 2019 10:07:45 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-4.v29.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.90_1) (envelope-from ) id 1iUpYs-0001tz-Vy for openvpn-devel@lists.sourceforge.net; Wed, 13 Nov 2019 10:07:42 +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=0VCjwGGiMMeyKaZE0Y0iWDJz1IQgssJMW2D7PVjnSj8=; b=iPGmA0d24aqpl+FwmaJqkDbjZ1 nPQbztY+oWCLNDD7jresBgKlM04qUVm8RWWD7qO43AwnmMM2rzmFU9kfgFkKUzGOTvoOH9srmzxUW mbWZiTwA1bprc/usb4LTtokhpeBDWQ76DbLIKXD6N+ckTrmCmtWh4ZO67V5KxYBGQxq4=; 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=0VCjwGGiMMeyKaZE0Y0iWDJz1IQgssJMW2D7PVjnSj8=; b=AVsccSIXE7GRVMQtIrzfc64TGw iFbuKLzYbAD6/vfSsutNTeoWgd1BUVUBGAHKPn0Zpo1/SJBrWx4GQuBHgZ07ajQPx+gAp4jo6PUZX KQxEu/thHInZz9ZnjIECfxEReQINvRkXn5SF1Cy2L4ADm5GcSPC8m74SYHKhetPLlojY=; Received: from mail-pf1-f169.google.com ([209.85.210.169]) by sfi-mx-4.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.92.2) id 1iUpYr-00ExYo-3G for openvpn-devel@lists.sourceforge.net; Wed, 13 Nov 2019 10:07:42 +0000 Received: by mail-pf1-f169.google.com with SMTP id p24so1337744pfn.4 for ; Wed, 13 Nov 2019 02:07:40 -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=0VCjwGGiMMeyKaZE0Y0iWDJz1IQgssJMW2D7PVjnSj8=; b=bZPqAxFM33+42UGRSWA+o+boLH+elraMBs27zutEDfSpxrHZJcf71eZt/7rh1Yl6OR o92IVqieMELEgTjvHrXhAz339tqvSBlLi9UxKUOCsoliGTgIwX7sK3fV3A1QyeZ3k/wq y455Rfh1H/k035rzyRrUJs6ugb4ppSyHpZCkv885GLCGFvOQhwBPomICdMBvzeqMVkEA OdMJjzUnXsz7D/as+cprAHbHRZXD1+oeStKdz//Wi7zdGZRB/VQrPaDFkTL9L+g03fTQ rVO/zopYIsogy7Vy9feEXPdlqxXeJzcKGcnfV14JTDChsx5trZrqHiDU47zZ/ZmtczQC Q5Hg== 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=0VCjwGGiMMeyKaZE0Y0iWDJz1IQgssJMW2D7PVjnSj8=; b=csoBQ+X2ji0RPgfZk+YKUu/+vTPekCUc0Qgnvrd4a/odIAzjg+w6tVGkYnFRuKqH35 idmfJP3oU0V19I5FprFJIwqwoWTRNbpUpPJr+1T5/jgb4XbRnB0+f+n0zf5RzJyIdlLr ErUqqJNp5EvaWLndBOBQjcIrgmaq2uYE6IH770C8mkmJJBrXY38/AT7kfRtbp6YnJur5 65zfH8vplnrg7GVizx4saB5Vw5nB3HRbpBfr0uAgNDwmhkJ/fDpUkf8zV/ETxbPkwyYv KyAM44BK4DlZ4tyjZ5c/nGpJMB7CS60F5ffjfrDJeaiGSAIWsppmr/hRuZJzW6NbsLLd 6FFw== X-Gm-Message-State: APjAAAU9fGDWokrAqvq4QhIkb7PcTc8WwhW30HKsenrmcH/zYq4kDhiy aqEl99MRHsOvQdhhtiqAfHfQwy0q X-Google-Smtp-Source: APXvYqzazssi+aiNPceqpwRbF9BomHq1htCQjbPeYzIuLeQqvIIbXRnjADyFMFmbXAQJmkJPiB8nRw== X-Received: by 2002:a63:6483:: with SMTP id y125mr2780805pgb.444.1573639655003; Wed, 13 Nov 2019 02:07:35 -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.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Nov 2019 02:07:34 -0800 (PST) From: Tom Yan To: openvpn-devel@lists.sourceforge.net Date: Wed, 13 Nov 2019 18:07:00 +0800 Message-Id: <20191113100702.6863-2-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.210.169 listed in list.dnswl.org] 0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [209.85.210.169 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: 1iUpYr-00ExYo-3G Subject: [Openvpn-devel] [PATCH v2 2/4] 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. --- src/openvpn/helper.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/src/openvpn/helper.c b/src/openvpn/helper.c index 470b9120..5b2ca0cc 100644 --- a/src/openvpn/helper.c +++ b/src/openvpn/helper.c @@ -328,31 +328,36 @@ helper_client_server(struct options *o) } 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, "subnet must be %s or lower", - print_netmask(30, &gc)); + 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) - 2; + o->ifconfig_pool_start = o->server_network + ptp + 1; + o->ifconfig_pool_end = (o->server_network | ~o->server_netmask) - ptp * 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); + 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 + 2, 0, &o->gc); + o->route_default_gateway = print_in_addr_t(o->server_network + ptp + 1, 0, &o->gc); } } else