From patchwork Thu Apr 1 02:13:26 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arne Schwabe X-Patchwork-Id: 1699 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director12.mail.ord1d.rsapps.net ([172.30.191.6]) by backend30.mail.ord1d.rsapps.net with LMTP id 0I/vBUjHZWA3DQAAIUCqbw (envelope-from ) for ; Thu, 01 Apr 2021 09:14:48 -0400 Received: from proxy8.mail.ord1d.rsapps.net ([172.30.191.6]) by director12.mail.ord1d.rsapps.net with LMTP id iK/CBUjHZWDKKgAAIasKDg (envelope-from ) for ; Thu, 01 Apr 2021 09:14:48 -0400 Received: from smtp15.gate.ord1d ([172.30.191.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy8.mail.ord1d.rsapps.net with LMTPS id SJxDBUjHZWCfNgAAGdz6CA (envelope-from ) for ; Thu, 01 Apr 2021 09:14:48 -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: smtp15.gate.ord1d.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: 3b48ec64-92ec-11eb-95c4-5254007ab6c8-1-1 Received: from [216.105.38.7] ([216.105.38.7:53148] helo=lists.sourceforge.net) by smtp15.gate.ord1d.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id 52/D4-01558-747C5606; Thu, 01 Apr 2021 09:14:47 -0400 Received: from [127.0.0.1] (helo=sfs-ml-1.v29.lw.sourceforge.com) by sfs-ml-1.v29.lw.sourceforge.com with esmtp (Exim 4.90_1) (envelope-from ) id 1lRx95-0000QI-Iq; Thu, 01 Apr 2021 13:13:59 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-1.v29.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lRx8w-0000O5-On for openvpn-devel@lists.sourceforge.net; Thu, 01 Apr 2021 13:13:50 +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=GT405I9v69S37xotFhdaLpjIhLScV6fuLafIY4gCqLA=; b=MHc03THQlG5Bjrg5rZKtzrRn8s CvN9Wt5BnnRYXApNREvmx2WPbreXKaFo1GQGaOQLJgfM4kOUjkan+AFShX3hlXWZu5cyfWjn591P0 B72y4pOxScvXuy4uLDL+0sb/byvp2n60YTM5JRhkh8ph5CKnFBvhiB7q3DqFczLl4tik=; 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=GT405I9v69S37xotFhdaLpjIhLScV6fuLafIY4gCqLA=; b=WKiNaBUzeNpBNiZ1efjcqevEIU eeEmog5U7x2AUyu0wFwTRtDaW7ln9xTHLJb+UytqQpSFQ2YiPc0E6/gvu1C8D95wOsPO4aRFprrul OfFzuYqoMjLmJesWwOIGqctpd5ayDZ20XnV9+pxgvObONmO/gtULck/nGysnecviC7QA=; Received: from mail.blinkt.de ([192.26.174.232]) by sfi-mx-1.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.92.2) id 1lRx8s-0036ag-Iq for openvpn-devel@lists.sourceforge.net; Thu, 01 Apr 2021 13:13:50 +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 1lRx8j-000J80-Si for openvpn-devel@lists.sourceforge.net; Thu, 01 Apr 2021 15:13:37 +0200 Received: (nullmailer pid 3738 invoked by uid 10006); Thu, 01 Apr 2021 13:13:37 -0000 From: Arne Schwabe To: openvpn-devel@lists.sourceforge.net Date: Thu, 1 Apr 2021 15:13:26 +0200 Message-Id: <20210401131337.3684-4-arne@rfc2549.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210401131337.3684-1-arne@rfc2549.org> References: <20210401131337.3684-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: 1lRx8s-0036ag-Iq Subject: [Openvpn-devel] [PATCH 03/14] Rename tunnel_server_udp_single_threaded to tunnel_server_udp 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 also eliminates the confusing name and eliminates tunnel_server_udp as wrapper that only calls tunnel_server_udp_single_threaded Signed-off-by: Arne Schwabe Acked-by: Gert Doering --- doc/doxygen/doc_eventloop.h | 2 +- doc/doxygen/doc_tunnel_state.h | 2 +- src/openvpn/mudp.c | 21 ++------------------- src/openvpn/mudp.h | 7 +++---- src/openvpn/openvpn.h | 2 +- 5 files changed, 8 insertions(+), 26 deletions(-) diff --git a/doc/doxygen/doc_eventloop.h b/doc/doxygen/doc_eventloop.h index 8bd26355e..e9f7ea6f4 100644 --- a/doc/doxygen/doc_eventloop.h +++ b/doc/doxygen/doc_eventloop.h @@ -61,6 +61,6 @@ * event loop function is called to drive the event processing. The * following implementations are available: * - Client mode using UDP or TCP: \c tunnel_point_to_point() - * - Server mode using UDP: \c tunnel_server_udp_single_threaded() + * - Server mode using UDP: \c tunnel_server_udp() * - Server mode using TCP: \c tunnel_server_tcp() */ diff --git a/doc/doxygen/doc_tunnel_state.h b/doc/doxygen/doc_tunnel_state.h index 46e750fda..104df2e91 100644 --- a/doc/doxygen/doc_tunnel_state.h +++ b/doc/doxygen/doc_tunnel_state.h @@ -118,7 +118,7 @@ * tunnel_point_to_point() or \c tunnel_server(). * * In server-mode, \c main() calls the \c tunnel_server() function, which - * transfers control to \c tunnel_server_udp_single_threaded() or \c + * transfers control to \c tunnel_server_udp() or \c * tunnel_server_tcp() depending on the external transport protocol. * * These functions receive the \c context created in \c main(). This diff --git a/src/openvpn/mudp.c b/src/openvpn/mudp.c index 5af1081fc..7977ece5d 100644 --- a/src/openvpn/mudp.c +++ b/src/openvpn/mudp.c @@ -284,19 +284,8 @@ p2mp_iow_flags(const struct multi_context *m) } -/**************************************************************************/ -/** - * Main event loop for OpenVPN in UDP server mode. - * @ingroup eventloop - * - * This function implements OpenVPN's main event loop for UDP server mode. - * At this time, OpenVPN does not yet support multithreading. This - * function's name is therefore slightly misleading. - * - * @param top - Top-level context structure. - */ -static void -tunnel_server_udp_single_threaded(struct context *top) +void +tunnel_server_udp(struct context *top) { struct multi_context multi; @@ -374,9 +363,3 @@ tunnel_server_udp_single_threaded(struct context *top) close_instance(top); } -void -tunnel_server_udp(struct context *top) -{ - tunnel_server_udp_single_threaded(top); -} - diff --git a/src/openvpn/mudp.h b/src/openvpn/mudp.h index 460a768b3..340381e08 100644 --- a/src/openvpn/mudp.h +++ b/src/openvpn/mudp.h @@ -32,14 +32,13 @@ struct context; struct multi_context; -/**************************************************************************/ /** - * Main event loop wrapper function for OpenVPN in UDP server mode. + * Main event loop for OpenVPN in UDP server mode. * @ingroup eventloop * - * This function simply calls \c tunnel_server_udp_single_threaded(). + * This function implements OpenVPN's main event loop for UDP server mode. * - * @param top - Top-level context structure. + * @param top - Top-level context structure. */ void tunnel_server_udp(struct context *top); diff --git a/src/openvpn/openvpn.h b/src/openvpn/openvpn.h index 1063351d3..0ddaeb730 100644 --- a/src/openvpn/openvpn.h +++ b/src/openvpn/openvpn.h @@ -230,7 +230,7 @@ is_cas_pending(enum client_connect_status cas) * \c SIGUSR1 restarts. * * This structure is initialized at the top of the \c - * tunnel_point_to_point(), \c tunnel_server_udp_single_threaded(), and \c + * tunnel_point_to_point(), \c tunnel_server_udp(), and \c * tunnel_server_tcp() functions. In other words, it is reset for every * iteration of the \c main() function's inner \c SIGUSR1 loop. */