diff options
| author | Alberto Gonzalez Iniesta <agi@inittab.org> | 2014-04-16 17:32:08 +0200 |
|---|---|---|
| committer | Alberto Gonzalez Iniesta <agi@inittab.org> | 2014-04-16 17:32:08 +0200 |
| commit | e5caec6bb07020a3e552fc78f679e0517c4569cf (patch) | |
| tree | 7e6c612db8bf52fdde057f35b2b4a5559e86e61b /src/openvpn/push.c | |
| parent | 72eb879255b983286b83678fd62228187fbedbb2 (diff) | |
| parent | 0af7f64094c65cba7ee45bd2679e6826bcf598cb (diff) | |
Merge tag 'upstream/2.3.3'
Upstream version 2.3.3
Diffstat (limited to 'src/openvpn/push.c')
| -rw-r--r-- | src/openvpn/push.c | 4 |
1 files changed, 3 insertions, 1 deletions
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); } |