From patchwork Mon Jul 20 01:51:56 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Sommerseth X-Patchwork-Id: 1314 X-Patchwork-Delegate: gert@greenie.muc.de Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director12.mail.ord1d.rsapps.net ([172.28.255.1]) by backend30.mail.ord1d.rsapps.net with LMTP id CKVqLtWFFV9mMgAAIUCqbw for ; Mon, 20 Jul 2020 07:53:57 -0400 Received: from proxy3.mail.ord1c.rsapps.net ([172.28.255.1]) by director12.mail.ord1d.rsapps.net with LMTP id EIxnLtWFFV+iOgAAIasKDg ; Mon, 20 Jul 2020 07:53:57 -0400 Received: from smtp9.gate.ord1c ([172.28.255.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy3.mail.ord1c.rsapps.net with LMTP id 4PLvLdWFFV+lNwAANIxBXg ; Mon, 20 Jul 2020 07:53: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: smtp9.gate.ord1c.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=fail (p=none; dis=none) header.from=openvpn.net X-Suspicious-Flag: YES X-Classification-ID: b1018b0e-ca7f-11ea-9269-0026b95bddb7-1-1 Received: from [216.105.38.7] ([216.105.38.7:43612] helo=lists.sourceforge.net) by smtp9.gate.ord1c.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id E3/EA-11671-5D5851F5; Mon, 20 Jul 2020 07:53:57 -0400 Received: from [127.0.0.1] (helo=sfs-ml-1.v29.lw.sourceforge.com) by sfs-ml-1.v29.lw.sourceforge.com with esmtp (Exim 4.90_1) (envelope-from ) id 1jxULy-0002jP-82; Mon, 20 Jul 2020 11:53:06 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-1.v29.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jxULx-0002j8-Ac for openvpn-devel@lists.sourceforge.net; Mon, 20 Jul 2020 11:53:05 +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:To:From:Sender:Reply-To:Cc: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=4Shw2GplOWMMAxMGpMjOJs/Aey0Xa/xiKwFIcTRfZ2U=; b=cXTfIKIsgVQXdRm2ySg6X4SlRX eRmVmBWNoT4mBiuXgCty5tf0+u7YFBgyb8WSLBCDTp4u+wyk4QZiULX7k24kszq02Haps+mPm19UF hOSSbEMccz20QWgLbujv9lPhOt2l6DRfOYDWYaPXGngQEiHZHo+vlgJ9Zig4XsTrE85k=; 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:To:From: Sender:Reply-To:Cc: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=4Shw2GplOWMMAxMGpMjOJs/Aey0Xa/xiKwFIcTRfZ2U=; b=C 7kizbs9/shPiiQqFWDrKnxqbVWFocvISyGdYBCBuSzQDdMgfvyi68hFEhsskEvaBTadESBAlYXoco uH1HzNwY8avFoakk6tZJNSCM+1KRyKA7SDVvoAEtSTe5Mk6QCBgYFaEc9vb2xrjVrEl8igORMXcKy b0QmGyFwjhrmiM/Y=; Received: from mx0.basenordic.cloud ([185.212.44.139]) by sfi-mx-1.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.92.2) id 1jxULv-001QM6-3a for openvpn-devel@lists.sourceforge.net; Mon, 20 Jul 2020 11:53:05 +0000 Received: from localhost (unknown [IPv6:::1]) by mx0.basenordic.cloud (Postfix) with ESMTP id 5344182EC29 for ; Mon, 20 Jul 2020 11:52:41 +0000 (UTC) Received: from mx0.basenordic.cloud ([IPv6:::1]) by localhost (winterfell.topphemmelig.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id Ycjv8IVSOc1i for ; Mon, 20 Jul 2020 13:52:39 +0200 (CEST) Received: from zimbra.sommerseth.email (zimbra.sommerseth.email [172.16.33.42]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx0.basenordic.cloud (Postfix) with ESMTPS id DFF3F8195C4 for ; Mon, 20 Jul 2020 13:52:39 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by zimbra.sommerseth.email (Postfix) with ESMTP id 560384015589 for ; Mon, 20 Jul 2020 13:52:35 +0200 (CEST) Received: from zimbra.sommerseth.email ([127.0.0.1]) by localhost (zimbra.sommerseth.email [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id QOUH-uF4yV2F for ; Mon, 20 Jul 2020 13:52:35 +0200 (CEST) Received: from optimus.homebase.sommerseths.net (unknown [10.35.7.3]) by zimbra.sommerseth.email (Postfix) with ESMTPS id AD41A4015588 for ; Mon, 20 Jul 2020 13:52:31 +0200 (CEST) From: David Sommerseth To: openvpn-devel@lists.sourceforge.net Date: Mon, 20 Jul 2020 13:51:56 +0200 Message-Id: <20200720115156.13322-1-davids@openvpn.net> X-Mailer: git-send-email 2.26.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 SPF_HELO_PASS SPF: HELO matches SPF record 0.0 HEADER_FROM_DIFFERENT_DOMAINS From and EnvelopeFrom 2nd level mail domains are different -0.0 SPF_PASS SPF: sender matches SPF record X-Headers-End: 1jxULv-001QM6-3a Subject: [Openvpn-devel] [PATCH] Remove --ifconfig-pool-linear 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 This option has been deprecated since OpenVPN 2.1 and it has been highlighted in the documentation and log files since OpenVPN 2.4.4. Signed-off-by: David Sommerseth Acked-by: Gert Doering --- Changes.rst | 3 +++ src/openvpn/options.c | 9 --------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/Changes.rst b/Changes.rst index a1d88a71..57823806 100644 --- a/Changes.rst +++ b/Changes.rst @@ -42,6 +42,9 @@ https://community.openvpn.net/openvpn/wiki/DeprecatedOptions This option will now cause server configurations to not start. Use ``--verify-client-cert none`` instead. +- ``--ifconfig-pool-linear`` has been removed + This option is removed. Use ``--topology p2p`` instead. + User-visible Changes -------------------- - If multiple connect handlers are used (client-connect, ccd, connect diff --git a/src/openvpn/options.c b/src/openvpn/options.c index 5a81b0c2..be763cfb 100644 --- a/src/openvpn/options.c +++ b/src/openvpn/options.c @@ -426,9 +426,6 @@ static const char usage_message[] = " client instance.\n" "--ifconfig-pool start-IP end-IP [netmask] : Set aside a pool of subnets\n" " to be dynamically allocated to connecting clients.\n" - "--ifconfig-pool-linear : (DEPRECATED) Use individual addresses rather \n" - " than /30 subnets\n in tun mode. Not compatible with\n" - " Windows clients.\n" "--ifconfig-pool-persist file [seconds] : Persist/unpersist ifconfig-pool\n" " data to file, at seconds intervals (default=600).\n" " If seconds=0, file will be treated as read-only.\n" @@ -6847,12 +6844,6 @@ add_option(struct options *options, options->ifconfig_pool_persist_refresh_freq = positive_atoi(p[2]); } } - else if (streq(p[0], "ifconfig-pool-linear") && !p[1]) - { - VERIFY_PERMISSION(OPT_P_GENERAL); - options->topology = TOP_P2P; - msg(M_WARN, "DEPRECATED OPTION: --ifconfig-pool-linear, use --topology p2p instead"); - } else if (streq(p[0], "ifconfig-ipv6-pool") && p[1] && !p[2]) { const int lev = M_WARN;