diff options
| author | David Sommerseth <davids@redhat.com> | 2014-12-09 10:52:44 +0100 |
|---|---|---|
| committer | David Sommerseth <davids@redhat.com> | 2014-12-09 11:00:17 +0100 |
| commit | 333566fd9d1951be97397f5f19d8bc78fb025af9 (patch) | |
| tree | a4e815261fba7e12f2bd30319c2cdba85a1e7b2e /src/openvpn/options.c | |
| parent | e2983bf2db3593ee5711066196f8cae5f5e91013 (diff) | |
| download | openvpn-333566fd9d1951be97397f5f19d8bc78fb025af9.tar.gz openvpn-333566fd9d1951be97397f5f19d8bc78fb025af9.tar.xz openvpn-333566fd9d1951be97397f5f19d8bc78fb025af9.zip | |
sockets: Remove the limitation of --tcp-nodelay to be server-only
The assert(0) happening if trying to use --tcp-nodelay in a client
config is really not helpful at all. When this assert(0) was removed,
another warning appeared that this could only be used in server
configs. That itself is also quite silly, as clients can choose to
use --socket-flags TCP_NODELAY in the client config instead. This
behaviour does not help the user in any way.
This patch removes the server-only restriction and rather provides
a more helpful warning when using --tcp-nodelay on the client side.
Trac: 489
Signed-off-by: David Sommerseth <davids@redhat.com>
Acked-by: Arne Schwabe <arne@rfc2549.org>
Message-Id: 1418118764-17846-1-git-send-email-openvpn.list@topphemmelig.net
URL: http://article.gmane.org/gmane.network.openvpn.devel/9334
(cherry picked from commit 706283d3765d1ee62dbd913fbfc191855b92528d)
Diffstat (limited to 'src/openvpn/options.c')
| -rw-r--r-- | src/openvpn/options.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/openvpn/options.c b/src/openvpn/options.c index 5bddca4..99d98b4 100644 --- a/src/openvpn/options.c +++ b/src/openvpn/options.c @@ -2126,7 +2126,9 @@ options_postprocess_verify_ce (const struct options *options, const struct conne if (options->ssl_flags & SSLF_OPT_VERIFY) msg (M_USAGE, "--opt-verify requires --mode server"); if (options->server_flags & SF_TCP_NODELAY_HELPER) - msg (M_USAGE, "--tcp-nodelay requires --mode server"); + msg (M_WARN, "WARNING: setting tcp-nodelay on the client side will not " + "affect the server. To have TCP_NODELAY in both direction use " + "tcp-nodelay in the server configuration instead."); if (options->auth_user_pass_verify_script) msg (M_USAGE, "--auth-user-pass-verify requires --mode server"); #if PORT_SHARE |