[Openvpn-devel] [S] Change in openvpn[master]: Warn if push is used without --mode server/--server/--server-bridge
cron2 has submitted this change. ( http://gerrit.openvpn.net/c/openvpn/+/1288?usp=email ) Change subject: Warn if push is used without --mode server/--server/--server-bridge .. Warn if push is used without --mode server/--server/--server-bridge This is not a supported configuration and will often work good enough to get a connection working but will operate more in a weird pre P2P negotiation compatibility way rather than actually negotiating protocol features. While at it, remove an unused macro (PUSH_DEFINED). Change-Id: I82c7c61be07593ecd5bf2f854767dda74ab5170c Signed-off-by: Arne Schwabe Acked-by: Frank Lichtenheld Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1288 Message-Id: <[email protected]> URL: https://www.mail-archive.com/[email protected]/msg33856.html Signed-off-by: Gert Doering --- M doc/man-sections/server-options.rst M src/openvpn/options.c M src/openvpn/options.h 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/doc/man-sections/server-options.rst b/doc/man-sections/server-options.rst index ccc1374..347a251 100644 --- a/doc/man-sections/server-options.rst +++ b/doc/man-sections/server-options.rst @@ -497,6 +497,9 @@ ``--echo``, ``--comp-lzo``, ``--socket-flags``, ``--sndbuf``, ``--rcvbuf``, ``--session-timeout`` + Note: using ``--push`` requires OpenVPN to run in ``--mode server`` (or + using of one of `--server`, `--server-bridge` helper directives). + --push-remove opt Selectively remove all ``--push`` options matching "opt" from the option list for a client. ``opt`` is matched as a substring against the whole diff --git a/src/openvpn/options.c b/src/openvpn/options.c index 65c6b3b..9c02a8c 100644 --- a/src/openvpn/options.c +++ b/src/openvpn/options.c @@ -2690,6 +2690,13 @@ MUST_BE_UNDEF(vlan_accept, "vlan-accept"); MUST_BE_UNDEF(vlan_pvid, "vlan-pvid"); MUST_BE_UNDEF(force_key_material_export, "force-key-material-export"); + +if (options->push_list.head) +{ +msg(M_WARN, "Note: Using --push without --mode server is an " +"unsupported configuration. Negotiation of OpenVPN " +"features is expected to fail."); +} } /* diff --git a/src/openvpn/options.h b/src/openvpn/options.h index 009904a..24253af 100644 --- a/src/openvpn/options.h +++ b/src/openvpn/options.h @@ -768,16 +768,11 @@ #define OPT_P_DEFAULT (~(OPT_P_INSTANCE | OPT_P_PULL_MODE)) #define PULL_DEFINED(opt) ((opt)->pull) -#define PUSH_DEFINED(opt) ((opt)->push_list) #ifndef PULL_DEFINED #define PULL_DEFINED(opt) (false) #endif -#ifndef PUSH_DEFINED -#define PUSH_DEFINED(opt) (false) -#endif - #ifdef _WIN32 #define ROUTE_OPTION_FLAGS(o) ((o)->route_method & ROUTE_METHOD_MASK) #else -- To view, visit http://gerrit.openvpn.net/c/openvpn/+/1288?usp=email To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: openvpn Gerrit-Branch: master Gerrit-Change-Id: I82c7c61be07593ecd5bf2f854767dda74ab5170c Gerrit-Change-Number: 1288 Gerrit-PatchSet: 3 Gerrit-Owner: plaisthos Gerrit-Reviewer: flichtenheld Gerrit-CC: openvpn-devel ___ Openvpn-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openvpn-devel
[Openvpn-devel] [S] Change in openvpn[master]: Warn if push is used without --mode server/--server/--server-bridge
cron2 has uploaded a new patch set (#3) to the change originally created by plaisthos. ( http://gerrit.openvpn.net/c/openvpn/+/1288?usp=email ) The following approvals got outdated and were removed: Code-Review+2 by flichtenheld Change subject: Warn if push is used without --mode server/--server/--server-bridge .. Warn if push is used without --mode server/--server/--server-bridge This is not a supported configuration and will often work good enough to get a connection working but will operate more in a weird pre P2P negotiation compatibility way rather than actually negotiating protocol features. While at it, remove an unused macro (PUSH_DEFINED). Change-Id: I82c7c61be07593ecd5bf2f854767dda74ab5170c Signed-off-by: Arne Schwabe Acked-by: Frank Lichtenheld Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1288 Message-Id: <[email protected]> URL: https://www.mail-archive.com/[email protected]/msg33856.html Signed-off-by: Gert Doering --- M doc/man-sections/server-options.rst M src/openvpn/options.c M src/openvpn/options.h 3 files changed, 10 insertions(+), 5 deletions(-) git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/88/1288/3 diff --git a/doc/man-sections/server-options.rst b/doc/man-sections/server-options.rst index ccc1374..347a251 100644 --- a/doc/man-sections/server-options.rst +++ b/doc/man-sections/server-options.rst @@ -497,6 +497,9 @@ ``--echo``, ``--comp-lzo``, ``--socket-flags``, ``--sndbuf``, ``--rcvbuf``, ``--session-timeout`` + Note: using ``--push`` requires OpenVPN to run in ``--mode server`` (or + using of one of `--server`, `--server-bridge` helper directives). + --push-remove opt Selectively remove all ``--push`` options matching "opt" from the option list for a client. ``opt`` is matched as a substring against the whole diff --git a/src/openvpn/options.c b/src/openvpn/options.c index 65c6b3b..9c02a8c 100644 --- a/src/openvpn/options.c +++ b/src/openvpn/options.c @@ -2690,6 +2690,13 @@ MUST_BE_UNDEF(vlan_accept, "vlan-accept"); MUST_BE_UNDEF(vlan_pvid, "vlan-pvid"); MUST_BE_UNDEF(force_key_material_export, "force-key-material-export"); + +if (options->push_list.head) +{ +msg(M_WARN, "Note: Using --push without --mode server is an " +"unsupported configuration. Negotiation of OpenVPN " +"features is expected to fail."); +} } /* diff --git a/src/openvpn/options.h b/src/openvpn/options.h index 009904a..24253af 100644 --- a/src/openvpn/options.h +++ b/src/openvpn/options.h @@ -768,16 +768,11 @@ #define OPT_P_DEFAULT (~(OPT_P_INSTANCE | OPT_P_PULL_MODE)) #define PULL_DEFINED(opt) ((opt)->pull) -#define PUSH_DEFINED(opt) ((opt)->push_list) #ifndef PULL_DEFINED #define PULL_DEFINED(opt) (false) #endif -#ifndef PUSH_DEFINED -#define PUSH_DEFINED(opt) (false) -#endif - #ifdef _WIN32 #define ROUTE_OPTION_FLAGS(o) ((o)->route_method & ROUTE_METHOD_MASK) #else -- To view, visit http://gerrit.openvpn.net/c/openvpn/+/1288?usp=email To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: openvpn Gerrit-Branch: master Gerrit-Change-Id: I82c7c61be07593ecd5bf2f854767dda74ab5170c Gerrit-Change-Number: 1288 Gerrit-PatchSet: 3 Gerrit-Owner: plaisthos Gerrit-Reviewer: flichtenheld Gerrit-CC: openvpn-devel ___ Openvpn-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openvpn-devel
[Openvpn-devel] [S] Change in openvpn[master]: Warn if push is used without --mode server/--server/--server-bridge
Attention is currently required from: plaisthos. flichtenheld has posted comments on this change by plaisthos. ( http://gerrit.openvpn.net/c/openvpn/+/1288?usp=email ) Change subject: Warn if push is used without --mode server/--server/--server-bridge .. Patch Set 2: Code-Review+2 (2 comments) Patchset: PS2: LGTM, but still a typo in commit message Commit Message: http://gerrit.openvpn.net/c/openvpn/+/1288/comment/a1908839_a42c5e1a?usp=email : PS2, Line 14: Also remove an anused macro. ```suggestion Also remove an unused macro. ``` -- To view, visit http://gerrit.openvpn.net/c/openvpn/+/1288?usp=email To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: openvpn Gerrit-Branch: master Gerrit-Change-Id: I82c7c61be07593ecd5bf2f854767dda74ab5170c Gerrit-Change-Number: 1288 Gerrit-PatchSet: 2 Gerrit-Owner: plaisthos Gerrit-Reviewer: flichtenheld Gerrit-CC: openvpn-devel Gerrit-Attention: plaisthos Gerrit-Comment-Date: Tue, 21 Oct 2025 10:48:00 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes ___ Openvpn-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openvpn-devel
[Openvpn-devel] [S] Change in openvpn[master]: Warn if push is used without --mode server/--server/--server-bridge
Attention is currently required from: flichtenheld.
Hello flichtenheld,
I'd like you to reexamine a change. Please visit
http://gerrit.openvpn.net/c/openvpn/+/1288?usp=email
to look at the new patch set (#2).
The following approvals got outdated and were removed:
Code-Review-1 by flichtenheld
Change subject: Warn if push is used without --mode
server/--server/--server-bridge
..
Warn if push is used without --mode server/--server/--server-bridge
This is not a supported configuration and will often work good enough
to get a connection working but will operate more in a weird pre P2P
negotiation compatibility way rather than actually negotiating
protocol features.
Also remove an anused macro.
Change-Id: I82c7c61be07593ecd5bf2f854767dda74ab5170c
Signed-off-by: Arne Schwabe
---
M doc/man-sections/server-options.rst
M src/openvpn/options.c
M src/openvpn/options.h
3 files changed, 10 insertions(+), 5 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/88/1288/2
diff --git a/doc/man-sections/server-options.rst
b/doc/man-sections/server-options.rst
index ccc1374..347a251 100644
--- a/doc/man-sections/server-options.rst
+++ b/doc/man-sections/server-options.rst
@@ -497,6 +497,9 @@
``--echo``, ``--comp-lzo``, ``--socket-flags``, ``--sndbuf``,
``--rcvbuf``, ``--session-timeout``
+ Note: using ``--push`` requires OpenVPN to run in ``--mode server`` (or
+ using of one of `--server`, `--server-bridge` helper directives).
+
--push-remove opt
Selectively remove all ``--push`` options matching "opt" from the option
list for a client. ``opt`` is matched as a substring against the whole
diff --git a/src/openvpn/options.c b/src/openvpn/options.c
index 65c6b3b..9c02a8c 100644
--- a/src/openvpn/options.c
+++ b/src/openvpn/options.c
@@ -2690,6 +2690,13 @@
MUST_BE_UNDEF(vlan_accept, "vlan-accept");
MUST_BE_UNDEF(vlan_pvid, "vlan-pvid");
MUST_BE_UNDEF(force_key_material_export, "force-key-material-export");
+
+if (options->push_list.head)
+{
+msg(M_WARN, "Note: Using --push without --mode server is an "
+"unsupported configuration. Negotiation of OpenVPN "
+"features is expected to fail.");
+}
}
/*
diff --git a/src/openvpn/options.h b/src/openvpn/options.h
index 009904a..24253af 100644
--- a/src/openvpn/options.h
+++ b/src/openvpn/options.h
@@ -768,16 +768,11 @@
#define OPT_P_DEFAULT (~(OPT_P_INSTANCE | OPT_P_PULL_MODE))
#define PULL_DEFINED(opt) ((opt)->pull)
-#define PUSH_DEFINED(opt) ((opt)->push_list)
#ifndef PULL_DEFINED
#define PULL_DEFINED(opt) (false)
#endif
-#ifndef PUSH_DEFINED
-#define PUSH_DEFINED(opt) (false)
-#endif
-
#ifdef _WIN32
#define ROUTE_OPTION_FLAGS(o) ((o)->route_method & ROUTE_METHOD_MASK)
#else
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1288?usp=email
To unsubscribe, or for help writing mail filters, visit
http://gerrit.openvpn.net/settings?usp=email
Gerrit-MessageType: newpatchset
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I82c7c61be07593ecd5bf2f854767dda74ab5170c
Gerrit-Change-Number: 1288
Gerrit-PatchSet: 2
Gerrit-Owner: plaisthos
Gerrit-Reviewer: flichtenheld
Gerrit-CC: openvpn-devel
Gerrit-Attention: flichtenheld
___
Openvpn-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openvpn-devel
[Openvpn-devel] [S] Change in openvpn[master]: Warn if push is used without --mode server/--server/--server-bridge
Attention is currently required from: flichtenheld. plaisthos has posted comments on this change by plaisthos. ( http://gerrit.openvpn.net/c/openvpn/+/1288?usp=email ) Change subject: Warn if push is used without --mode server/--server/--server-bridge .. Patch Set 1: (4 comments) Commit Message: http://gerrit.openvpn.net/c/openvpn/+/1288/comment/d7f5c5d0_97f445f3?usp=email : PS1, Line 14: Also remove an used macro. > "unused" I assume Acknowledged File src/openvpn/options.c: http://gerrit.openvpn.net/c/openvpn/+/1288/comment/9676fd5c_46a87c6f?usp=email : PS1, Line 3337: > whitespace Done http://gerrit.openvpn.net/c/openvpn/+/1288/comment/04ba28cd_b064d58d?usp=email : PS1, Line 3338: if (o->push_list.head && o->mode != MODE_SERVER) > We have a lot of warnings and errors that we potentially throw if not in > --mode server, see code aro […] Done http://gerrit.openvpn.net/c/openvpn/+/1288/comment/861ffac4_9f1909cd?usp=email : PS1, Line 3340: msg(M_WARN, "Note: Using --push without --mode server is an unsupported" > We probably also should add a note under --push in the documentation. Done -- To view, visit http://gerrit.openvpn.net/c/openvpn/+/1288?usp=email To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: openvpn Gerrit-Branch: master Gerrit-Change-Id: I82c7c61be07593ecd5bf2f854767dda74ab5170c Gerrit-Change-Number: 1288 Gerrit-PatchSet: 1 Gerrit-Owner: plaisthos Gerrit-Reviewer: flichtenheld Gerrit-CC: openvpn-devel Gerrit-Attention: flichtenheld Gerrit-Comment-Date: Mon, 20 Oct 2025 16:16:03 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: flichtenheld ___ Openvpn-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openvpn-devel
[Openvpn-devel] [S] Change in openvpn[master]: Warn if push is used without --mode server/--server/--server-bridge
Attention is currently required from: plaisthos. flichtenheld has posted comments on this change by plaisthos. ( http://gerrit.openvpn.net/c/openvpn/+/1288?usp=email ) Change subject: Warn if push is used without --mode server/--server/--server-bridge .. Patch Set 1: Code-Review-1 (4 comments) Commit Message: http://gerrit.openvpn.net/c/openvpn/+/1288/comment/f7cedb8d_5f290a51?usp=email : PS1, Line 14: Also remove an used macro. "unused" I assume File src/openvpn/options.c: http://gerrit.openvpn.net/c/openvpn/+/1288/comment/d6b588cf_299e97fa?usp=email : PS1, Line 3337: whitespace http://gerrit.openvpn.net/c/openvpn/+/1288/comment/bf2317ec_7c3577ee?usp=email : PS1, Line 3338: if (o->push_list.head && o->mode != MODE_SERVER) We have a lot of warnings and errors that we potentially throw if not in --mode server, see code around line 2650. Maybe this new check would be better put there? http://gerrit.openvpn.net/c/openvpn/+/1288/comment/1d984d7c_11af20d7?usp=email : PS1, Line 3340: msg(M_WARN, "Note: Using --push without --mode server is an unsupported" We probably also should add a note under --push in the documentation. -- To view, visit http://gerrit.openvpn.net/c/openvpn/+/1288?usp=email To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: openvpn Gerrit-Branch: master Gerrit-Change-Id: I82c7c61be07593ecd5bf2f854767dda74ab5170c Gerrit-Change-Number: 1288 Gerrit-PatchSet: 1 Gerrit-Owner: plaisthos Gerrit-Reviewer: flichtenheld Gerrit-CC: openvpn-devel Gerrit-Attention: plaisthos Gerrit-Comment-Date: Mon, 20 Oct 2025 14:57:01 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes ___ Openvpn-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openvpn-devel
[Openvpn-devel] [S] Change in openvpn[master]: Warn if push is used without --mode server/--server/--server-bridge
Attention is currently required from: flichtenheld.
Hello flichtenheld,
I'd like you to do a code review.
Please visit
http://gerrit.openvpn.net/c/openvpn/+/1288?usp=email
to review the following change.
Change subject: Warn if push is used without --mode
server/--server/--server-bridge
..
Warn if push is used without --mode server/--server/--server-bridge
This is not a supported configuration and will often work good enough
to get a connection working but will operate more in a weird pre P2P
negotiation compatibility way rather than actually negotiating
protocol features.
Also remove an used macro.
Change-Id: I82c7c61be07593ecd5bf2f854767dda74ab5170c
---
M src/openvpn/options.c
M src/openvpn/options.h
2 files changed, 6 insertions(+), 5 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/88/1288/1
diff --git a/src/openvpn/options.c b/src/openvpn/options.c
index 65c6b3b..6cfe62f 100644
--- a/src/openvpn/options.c
+++ b/src/openvpn/options.c
@@ -3334,6 +3334,12 @@
"Ignoring these options.");
}
}
+
+if (o->push_list.head && o->mode != MODE_SERVER)
+{
+msg(M_WARN, "Note: Using --push without --mode server is an
unsupported"
+" configuration. Negotiation of OpenVPN features is
expected to fail.");
+}
}
static void
diff --git a/src/openvpn/options.h b/src/openvpn/options.h
index 009904a..24253af 100644
--- a/src/openvpn/options.h
+++ b/src/openvpn/options.h
@@ -768,16 +768,11 @@
#define OPT_P_DEFAULT (~(OPT_P_INSTANCE | OPT_P_PULL_MODE))
#define PULL_DEFINED(opt) ((opt)->pull)
-#define PUSH_DEFINED(opt) ((opt)->push_list)
#ifndef PULL_DEFINED
#define PULL_DEFINED(opt) (false)
#endif
-#ifndef PUSH_DEFINED
-#define PUSH_DEFINED(opt) (false)
-#endif
-
#ifdef _WIN32
#define ROUTE_OPTION_FLAGS(o) ((o)->route_method & ROUTE_METHOD_MASK)
#else
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1288?usp=email
To unsubscribe, or for help writing mail filters, visit
http://gerrit.openvpn.net/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I82c7c61be07593ecd5bf2f854767dda74ab5170c
Gerrit-Change-Number: 1288
Gerrit-PatchSet: 1
Gerrit-Owner: plaisthos
Gerrit-Reviewer: flichtenheld
Gerrit-CC: openvpn-devel
Gerrit-Attention: flichtenheld
___
Openvpn-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openvpn-devel
