diff options
| -rw-r--r-- | src/openvpn/forward.c | 15 | ||||
| -rw-r--r-- | src/openvpn/forward.h | 9 | ||||
| -rw-r--r-- | src/openvpn/multi.c | 4 | ||||
| -rw-r--r-- | src/openvpn/push.c | 9 | ||||
| -rw-r--r-- | src/openvpn/push.h | 2 |
5 files changed, 24 insertions, 15 deletions
diff --git a/src/openvpn/forward.c b/src/openvpn/forward.c index 8296900..6f7a500 100644 --- a/src/openvpn/forward.c +++ b/src/openvpn/forward.c @@ -342,6 +342,12 @@ send_control_channel_string_dowork(struct tls_multi *multi, return stat; } +void reschedule_multi_process(struct context *c) +{ + interval_action(&c->c2.tmp_int); + context_immediate_reschedule(c); /* ZERO-TIMEOUT */ +} + bool send_control_channel_string(struct context *c, const char *str, int msglevel) { @@ -349,15 +355,8 @@ send_control_channel_string(struct context *c, const char *str, int msglevel) { bool ret = send_control_channel_string_dowork(c->c2.tls_multi, str, msglevel); - /* - * Reschedule tls_multi_process. - * NOTE: in multi-client mode, usually the below two statements are - * insufficient to reschedule the client instance object unless - * multi_schedule_context_wakeup(m, mi) is also called. - */ + reschedule_multi_process(c); - interval_action(&c->c2.tmp_int); - context_immediate_reschedule(c); /* ZERO-TIMEOUT */ return ret; } return true; diff --git a/src/openvpn/forward.h b/src/openvpn/forward.h index a8b19f6..9ce3bc1 100644 --- a/src/openvpn/forward.h +++ b/src/openvpn/forward.h @@ -317,6 +317,15 @@ bool send_control_channel_string_dowork(struct tls_multi *multi, const char *str, int msglevel); + +/** + * Reschedule tls_multi_process. + * NOTE: in multi-client mode, usually calling the function is + * insufficient to reschedule the client instance object unless + * multi_schedule_context_wakeup(m, mi) is also called. + */ +void reschedule_multi_process(struct context *c); + #define PIPV4_PASSTOS (1<<0) #define PIP_MSSFIX (1<<1) /* v4 and v6 */ #define PIP_OUTGOING (1<<2) diff --git a/src/openvpn/multi.c b/src/openvpn/multi.c index ac5d3f5..d10f188 100644 --- a/src/openvpn/multi.c +++ b/src/openvpn/multi.c @@ -3904,7 +3904,9 @@ management_client_pending_auth(void *arg, if (mi) { /* sends INFO_PRE and AUTH_PENDING messages to client */ - bool ret = send_auth_pending_messages(&mi->context, extra, timeout); + bool ret = send_auth_pending_messages(mi->context.c2.tls_multi, extra, + timeout); + reschedule_multi_process(&mi->context); multi_schedule_context_wakeup(m, mi); return ret; } diff --git a/src/openvpn/push.c b/src/openvpn/push.c index 4626783..320ad73 100644 --- a/src/openvpn/push.c +++ b/src/openvpn/push.c @@ -363,10 +363,9 @@ send_auth_failed(struct context *c, const char *client_reason) bool -send_auth_pending_messages(struct context *c, const char *extra, +send_auth_pending_messages(struct tls_multi *tls_multi, const char *extra, unsigned int timeout) { - struct tls_multi *tls_multi = c->c2.tls_multi; struct key_state *ks = &tls_multi->session[TM_ACTIVE].key[KS_PRIMARY]; static const char info_pre[] = "INFO_PRE,"; @@ -384,7 +383,7 @@ send_auth_pending_messages(struct context *c, const char *extra, struct gc_arena gc = gc_new(); if ((proto & IV_PROTO_AUTH_PENDING_KW) == 0) { - send_control_channel_string(c, "AUTH_PENDING", D_PUSH); + send_control_channel_string_dowork(tls_multi, "AUTH_PENDING", D_PUSH); } else { @@ -395,7 +394,7 @@ send_auth_pending_messages(struct context *c, const char *extra, struct buffer buf = alloc_buf_gc(len, &gc); buf_printf(&buf, auth_pre); buf_printf(&buf, "%u", timeout); - send_control_channel_string(c, BSTR(&buf), D_PUSH); + send_control_channel_string_dowork(tls_multi, BSTR(&buf), D_PUSH); } size_t len = strlen(extra) + 1 + sizeof(info_pre); @@ -408,7 +407,7 @@ send_auth_pending_messages(struct context *c, const char *extra, struct buffer buf = alloc_buf_gc(len, &gc); buf_printf(&buf, info_pre); buf_printf(&buf, "%s", extra); - send_control_channel_string(c, BSTR(&buf), D_PUSH); + send_control_channel_string_dowork(tls_multi, BSTR(&buf), D_PUSH); ks->auth_deferred_expire = now + timeout; diff --git a/src/openvpn/push.h b/src/openvpn/push.h index e7271de..377f94a 100644 --- a/src/openvpn/push.h +++ b/src/openvpn/push.h @@ -78,7 +78,7 @@ void send_auth_failed(struct context *c, const char *client_reason); * more details on message format */ bool -send_auth_pending_messages(struct context *c, const char *extra, +send_auth_pending_messages(struct tls_multi *tls_multi, const char *extra, unsigned int timeout); void send_restart(struct context *c, const char *kill_msg); |