diff options
| author | Jens Wagner <jwagner@hexonet.net> | 2014-01-07 22:07:54 +0100 |
|---|---|---|
| committer | Gert Doering <gert@greenie.muc.de> | 2014-01-07 22:16:50 +0100 |
| commit | e93fb8ceebe9ca7748d8874893221a40330564e4 (patch) | |
| tree | 93ad245f984f1e090d5ada2a9871855067a1cb3a /src | |
| parent | 5690c525e58769a72fb5dbe63b5f6af78dff92ad (diff) | |
| download | openvpn-e93fb8ceebe9ca7748d8874893221a40330564e4.tar.gz openvpn-e93fb8ceebe9ca7748d8874893221a40330564e4.tar.xz openvpn-e93fb8ceebe9ca7748d8874893221a40330564e4.zip | |
Fix spurious ignoring of pushed config options (trac#349).
The function incoming_push_message(...) in push.c uses a local variable
option_types_found, that gets passed to do_up(...).
If the server push got split into several parts, only the last part
(PUSH_MSG_REPLY) option_types_found is used for do_up (initilized as 0
locally), the previous ones (PUSH_MSG_CONTINUATION) are ignored.
So e.g. a ping config, pushed by the server in the first push, followed
by a lot of "push route" configs, causing a second push message, will
have the do_up() called, but without e.g. the OPT_P_TIMER flag, so those
options will be silently ignored.
The patch resolves that, by introducing "push_option_types_found" in
"c->options" and using that as storage.
Fix trac bug #349.
Acked-by: Gert Doering <gert@greenie.muc.de>
URL: https://community.openvpn.net/openvpn/ticket/349
Signed-off-by: Gert Doering <gert@greenie.muc.de>
(cherry picked from commit 1aac9a0b7a4046822a0134cd8693a828f2e16576)
Diffstat (limited to 'src')
| -rw-r--r-- | src/openvpn/options.c | 1 | ||||
| -rw-r--r-- | src/openvpn/options.h | 1 | ||||
| -rw-r--r-- | src/openvpn/push.c | 4 |
3 files changed, 5 insertions, 1 deletions
diff --git a/src/openvpn/options.c b/src/openvpn/options.c index 2879654..34e44ec 100644 --- a/src/openvpn/options.c +++ b/src/openvpn/options.c @@ -2867,6 +2867,7 @@ pre_pull_restore (struct options *o) } o->push_continuation = 0; + o->push_option_types_found = 0; } #endif diff --git a/src/openvpn/options.h b/src/openvpn/options.h index c5f104f..8cbb85a 100644 --- a/src/openvpn/options.h +++ b/src/openvpn/options.h @@ -460,6 +460,7 @@ struct options bool client; bool pull; /* client pull of config options from server */ int push_continuation; + unsigned int push_option_types_found; const char *auth_user_pass_file; struct options_pre_pull *pre_pull; diff --git a/src/openvpn/push.c b/src/openvpn/push.c index be50bef..11505cb 100644 --- a/src/openvpn/push.c +++ b/src/openvpn/push.c @@ -202,8 +202,10 @@ incoming_push_message (struct context *c, const struct buffer *buffer) msg (D_PUSH_ERRORS, "WARNING: Received bad push/pull message: %s", sanitize_control_message(BSTR(buffer), &gc)); else if (status == PUSH_MSG_REPLY || status == PUSH_MSG_CONTINUATION) { + c->options.push_option_types_found |= option_types_found; + if (status == PUSH_MSG_REPLY) - do_up (c, true, option_types_found); /* delay bringing tun/tap up until --push parms received from remote */ + do_up (c, true, c->options.push_option_types_found ); /* delay bringing tun/tap up until --push parms received from remote */ event_timeout_clear (&c->c2.push_request_interval); } |