From patchwork Tue Mar 9 23:28:23 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arne Schwabe X-Patchwork-Id: 1613 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director15.mail.ord1d.rsapps.net ([172.31.255.6]) by backend30.mail.ord1d.rsapps.net with LMTP id wO//CZGfSGC6AgAAIUCqbw (envelope-from ) for ; Wed, 10 Mar 2021 05:29:37 -0500 Received: from proxy18.mail.iad3b.rsapps.net ([172.31.255.6]) by director15.mail.ord1d.rsapps.net with LMTP id oGqgCZGfSGAqOgAAIcMcQg (envelope-from ) for ; Wed, 10 Mar 2021 05:29:37 -0500 Received: from smtp36.gate.iad3b ([172.31.255.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy18.mail.iad3b.rsapps.net with LMTPS id 6HpyApGfSGAiTwAA3NpJmQ (envelope-from ) for ; Wed, 10 Mar 2021 05:29:37 -0500 X-Spam-Threshold: 95 X-Spam-Score: 0 X-Spam-Flag: NO X-Virus-Scanned: OK X-Orig-To: openvpnslackdevel@openvpn.net X-Originating-Ip: [216.105.38.7] Authentication-Results: smtp36.gate.iad3b.rsapps.net; iprev=pass policy.iprev="216.105.38.7"; spf=pass smtp.mailfrom="openvpn-devel-bounces@lists.sourceforge.net" smtp.helo="lists.sourceforge.net"; dkim=fail (signature verification failed) header.d=sourceforge.net; dkim=fail (signature verification failed) header.d=sf.net; dmarc=none (p=nil; dis=none) header.from=rfc2549.org X-Suspicious-Flag: YES X-Classification-ID: 82c04e74-818b-11eb-b870-5254003a7283-1-1 Received: from [216.105.38.7] ([216.105.38.7:39524] helo=lists.sourceforge.net) by smtp36.gate.iad3b.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id E6/C6-07797-09F98406; Wed, 10 Mar 2021 05:29:36 -0500 Received: from [127.0.0.1] (helo=sfs-ml-4.v29.lw.sourceforge.com) by sfs-ml-4.v29.lw.sourceforge.com with esmtp (Exim 4.90_1) (envelope-from ) id 1lJw52-0000G2-P6; Wed, 10 Mar 2021 10:28:40 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-4.v29.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lJw50-0000Fn-J7 for openvpn-devel@lists.sourceforge.net; Wed, 10 Mar 2021 10:28:38 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=References:In-Reply-To:Message-Id:Date:Subject:To: From:Sender:Reply-To:Cc:MIME-Version:Content-Type:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=brwxmnE9x9OLXvJRZRN4Lky2oGjm67Ci+sTFxp1V6k8=; b=P+yic02ZcrF/dzAgvwNH2vuAOj +gdZGvGSaiLOhMMf9uY/qlS0JEDkcRz8QtISPxgdaUil1X36oPz5ue/NDMDgOVetshSiwnpqfO77q 32F6Z5ZPdBbPXjOyiPpPHwVSx79AvTcJrucuWF+msYr8DSOrk3rf35HKX6mlk5aSzHXk=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=References:In-Reply-To:Message-Id:Date:Subject:To:From:Sender:Reply-To:Cc :MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=brwxmnE9x9OLXvJRZRN4Lky2oGjm67Ci+sTFxp1V6k8=; b=fu62ds5M2AK1UMByCSu9CSuh7y +hwoE6ya8BangudBa3G2zHIqTXBiHzQD5I7bMhVUgX8kqXv1Tc4PbX7whBlrDp5vb/CL1m3tjm2Im rHg3jB/sAt+s/4bU1Z2h2CvNf+OFD54PLYr1DRIT1hwNrOWb8KrphSa/mGSEnZRKwwys=; Received: from mail.blinkt.de ([192.26.174.232]) by sfi-mx-2.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.92.3) id 1lJw4s-0001Tp-FK for openvpn-devel@lists.sourceforge.net; Wed, 10 Mar 2021 10:28:38 +0000 Received: from kamera.blinkt.de ([2001:638:502:390:20c:29ff:fec8:535c]) by mail.blinkt.de with smtp (Exim 4.94 (FreeBSD)) (envelope-from ) id 1lJw4l-000INo-7a for openvpn-devel@lists.sourceforge.net; Wed, 10 Mar 2021 11:28:23 +0100 Received: (nullmailer pid 29552 invoked by uid 10006); Wed, 10 Mar 2021 10:28:23 -0000 From: Arne Schwabe To: openvpn-devel@lists.sourceforge.net Date: Wed, 10 Mar 2021 11:28:23 +0100 Message-Id: <20210310102823.29508-1-arne@rfc2549.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210201150340.19305-1-arne@rfc2549.org> References: <20210201150340.19305-1-arne@rfc2549.org> X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. See http://spamassassin.org/tag/ for more details. 0.0 URIBL_BLOCKED ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [URIs: rfc2549.org] 0.2 HEADER_FROM_DIFFERENT_DOMAINS From and EnvelopeFrom 2nd level mail domains are different 0.0 SPF_NONE SPF: sender does not publish an SPF Record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record X-Headers-End: 1lJw4s-0001Tp-FK Subject: [Openvpn-devel] [PATCH v4] Change parameter of send_auth_pending_messages from context to tls_multi X-BeenThere: openvpn-devel@lists.sourceforge.net X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox This prepares send_auth_pending_messages to be used a in context that does not have context c available but also does not need to schedule an immediate sending of the message (auth plugin/script) Patch V2: Adjust the comment of reschedule_multi_process to actually fit a function. Patch V3: Rebase needed because v3 of 3/11 Patch V4: Send with push.h prototype Signed-off-by: Arne Schwabe Acked-by: Gert Doering --- src/openvpn/forward.c | 17 +++++++++-------- src/openvpn/forward.h | 9 +++++++++ src/openvpn/multi.c | 4 +++- src/openvpn/push.c | 9 ++++----- src/openvpn/push.h | 2 +- 5 files changed, 26 insertions(+), 15 deletions(-) diff --git a/src/openvpn/forward.c b/src/openvpn/forward.c index 8296900e..828abb25 100644 --- a/src/openvpn/forward.c +++ b/src/openvpn/forward.c @@ -342,6 +342,14 @@ 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 +357,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 a8b19f69..9ce3bc1c 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 ac5d3f5b..d10f188c 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 46267835..320ad737 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 e7271de2..377f94a6 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);