From patchwork Fri Apr 22 04:29:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arne Schwabe X-Patchwork-Id: 2404 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director13.mail.ord1d.rsapps.net ([172.27.255.58]) by backend41.mail.ord1d.rsapps.net with LMTP id 4P0PF4XAYmLCYgAAqwncew (envelope-from ) for ; Fri, 22 Apr 2022 10:49:41 -0400 Received: from proxy12.mail.iad3a.rsapps.net ([172.27.255.58]) by director13.mail.ord1d.rsapps.net with LMTP id mB4aNIXAYmJAXAAA91zNiA (envelope-from ) for ; Fri, 22 Apr 2022 10:49:41 -0400 Received: from smtp10.gate.iad3a ([172.27.255.58]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy12.mail.iad3a.rsapps.net with LMTPS id SFtDLYXAYmL5AQAAh9K5Vw (envelope-from ) for ; Fri, 22 Apr 2022 10:49:41 -0400 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: smtp10.gate.iad3a.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: 7014d220-c24b-11ec-88be-525400a8203f-1-1 Received: from [216.105.38.7] ([216.105.38.7:52552] helo=lists.sourceforge.net) by smtp10.gate.iad3a.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id B9/D4-19657-480C2626; Fri, 22 Apr 2022 10:49:40 -0400 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.94.2) (envelope-from ) id 1nhuaG-0001uM-DH; Fri, 22 Apr 2022 14:48:31 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-4.v29.lw.sourceforge.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1nhuaE-0001uB-7x for openvpn-devel@lists.sourceforge.net; Fri, 22 Apr 2022 14:48:28 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=Content-Transfer-Encoding:MIME-Version:References: In-Reply-To:Message-Id:Date:Subject:To:From:Sender:Reply-To:Cc:Content-Type: 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=yFiOBus8qk0SC2143KH6A+XnKxPOcoHHz48PG6qQ+sI=; b=S+h0v0FUaOZjXxgn0Ne2rcCtXC bnv5my4fHaCEHLUReKbvrKQHGh8Ic6tY62Ejk7/XSuIiVA5c90foDeULeLLZsVqfPd/PMtbPZ8s7u rgk2vgNH0lFyH+hRDFpyNnD+AS4WhIaCHeHQarKAF4HVnevmsmJj5oh8J/sxff4ARY/Y=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To:Message-Id: Date:Subject:To:From:Sender:Reply-To:Cc:Content-Type: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=yFiOBus8qk0SC2143KH6A+XnKxPOcoHHz48PG6qQ+sI=; b=dXWa7Unqi1EdeltMkn9aD1VSGY OS3tYEf5InPY4yxZm7p+5oyyrAKG0sH4Ib5j7H2uRF8K7CwSWAETXSHQ1ivT3KoAQx6BniQ5MiP44 GTLpRYrUMkEhFgebeFarGkt77ocr1hko/Wv8hJkHRI6rxtoJWtqk1Rs9C3LxJD2LNI8U=; Received: from mail.blinkt.de ([192.26.174.232]) by sfi-mx-2.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.94.2) id 1nhuaC-0006bi-3d for openvpn-devel@lists.sourceforge.net; Fri, 22 Apr 2022 14:48:28 +0000 Received: from kamera.blinkt.de ([2001:638:502:390:20c:29ff:fec8:535c]) by mail.blinkt.de with smtp (Exim 4.95 (FreeBSD)) (envelope-from ) id 1nhuID-00096Z-Ke for openvpn-devel@lists.sourceforge.net; Fri, 22 Apr 2022 16:29:53 +0200 Received: (nullmailer pid 3805426 invoked by uid 10006); Fri, 22 Apr 2022 14:29:53 -0000 From: Arne Schwabe To: openvpn-devel@lists.sourceforge.net Date: Fri, 22 Apr 2022 16:29:40 +0200 Message-Id: <20220422142953.3805364-6-arne@rfc2549.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220422142953.3805364-1-arne@rfc2549.org> References: <20220422134038.3801239-1-arne@rfc2549.org> <20220422142953.3805364-1-arne@rfc2549.org> MIME-Version: 1.0 X-Spam-Report: Spam detection software, running on the system "util-spamd-2.v13.lw.sourceforge.com", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: This is probably a result from earlier code that still needed to be C89 compatible add probably added this to allow variable decleration --- src/openvpn/ssl.c | 56 +++++++++++++++++++++++ [...] Content analysis details: (0.2 points, 6.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 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 X-Headers-End: 1nhuaC-0006bi-3d Subject: [Openvpn-devel] [PATCH 15/28] Remove pointless indentation from tls_process. 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: , Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox This is probably a result from earlier code that still needed to be C89 compatible add probably added this to allow variable decleration Acked-by: Frank Lichtenheld --- src/openvpn/ssl.c | 56 +++++++++++++++++++++++------------------------ 1 file changed, 27 insertions(+), 29 deletions(-) diff --git a/src/openvpn/ssl.c b/src/openvpn/ssl.c index 15af58949..097be8c02 100644 --- a/src/openvpn/ssl.c +++ b/src/openvpn/ssl.c @@ -2774,45 +2774,43 @@ tls_process(struct tls_multi *multi, } /* When should we wake up again? */ + if (ks->state >= S_INITIAL) { - if (ks->state >= S_INITIAL) - { - compute_earliest_wakeup(wakeup, - reliable_send_timeout(ks->send_reliable)); - - if (ks->must_negotiate) - { - compute_earliest_wakeup(wakeup, ks->must_negotiate - now); - } - } + compute_earliest_wakeup(wakeup, + reliable_send_timeout(ks->send_reliable)); - if (ks->established && session->opt->renegotiate_seconds) + if (ks->must_negotiate) { - compute_earliest_wakeup(wakeup, - ks->established + session->opt->renegotiate_seconds - now); + compute_earliest_wakeup(wakeup, ks->must_negotiate - now); } + } - dmsg(D_TLS_DEBUG, "TLS: tls_process: timeout set to %d", *wakeup); + if (ks->established && session->opt->renegotiate_seconds) + { + compute_earliest_wakeup(wakeup, + ks->established + session->opt->renegotiate_seconds - now); + } - /* prevent event-loop spinning by setting minimum wakeup of 1 second */ - if (*wakeup <= 0) - { - *wakeup = 1; + dmsg(D_TLS_DEBUG, "TLS: tls_process: timeout set to %d", *wakeup); - /* if we had something to send to remote, but to_link was busy, - * let caller know we need to be called again soon */ - return true; - } + /* prevent event-loop spinning by setting minimum wakeup of 1 second */ + if (*wakeup <= 0) + { + *wakeup = 1; - /* If any of the state changes resulted in the to_link buffer being - * set, we are also active */ - if (to_link->len) - { - return true; - } + /* if we had something to send to remote, but to_link was busy, + * let caller know we need to be called again soon */ + return true; + } - return false; + /* If any of the state changes resulted in the to_link buffer being + * set, we are also active */ + if (to_link->len) + { + return true; } + + return false; } /*