From 02a0332084f0dc08e39067cc6fd68abb77a03c47 Mon Sep 17 00:00:00 2001 From: Gert Doering Date: Sat, 20 Jun 2020 20:05:32 +0200 Subject: [PATCH] Depreciation warning for --topology net30 on servers with IPv4 pools. IPv4 pool handling needs lots of extra code to deal with "topology net30", so we want to remove that combination in a future release. Warn people about this in 2.5 so nobody is hit by this as a surprise. Client- and ifconfig-support for net30 will stay, as "just net30" is not what brings maintenance effort here (totally removing all options except "topology subnet" would be beneficial but is a bit too radical today) Trac: #1288 Signed-off-by: Gert Doering Acked-by: Arne Schwabe Message-Id: <20200620180532.15738-1-gert@greenie.muc.de> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg20041.html Signed-off-by: Gert Doering --- src/openvpn/helper.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/openvpn/helper.c b/src/openvpn/helper.c index fbfc287f1..2cc579e77 100644 --- a/src/openvpn/helper.c +++ b/src/openvpn/helper.c @@ -359,6 +359,14 @@ helper_client_server(struct options *o) } push_option(o, print_opt_topology(topology, &o->gc), M_USAGE); + + if (topology == TOP_NET30 && !(o->server_flags & SF_NOPOOL)) + { + msg(M_WARN, "WARNING: --topology net30 support for server " + "configs with IPv4 pools will be removed in a future " + "release. Please migrate to --topology subnet as soon " + "as possible."); + } } else if (dev == DEV_TYPE_TAP) { -- 2.47.2