From patchwork Tue Jun 21 06:16:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arne Schwabe X-Patchwork-Id: 2519 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director12.mail.ord1d.rsapps.net ([172.27.255.50]) by backend41.mail.ord1d.rsapps.net with LMTP id yGkKI0nvsWJvKAAAqwncew (envelope-from ) for ; Tue, 21 Jun 2022 12:18:17 -0400 Received: from proxy15.mail.iad3a.rsapps.net ([172.27.255.50]) by director12.mail.ord1d.rsapps.net with LMTP id mDLWIknvsWIlUQAAIasKDg (envelope-from ) for ; Tue, 21 Jun 2022 12:18:17 -0400 Received: from smtp53.gate.iad3a ([172.27.255.50]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy15.mail.iad3a.rsapps.net with LMTPS id oPV5HUnvsWIURgAAHi9b9g (envelope-from ) for ; Tue, 21 Jun 2022 12:18:17 -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: smtp53.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: c1ab590e-f17d-11ec-bc4d-5254009c3572-1-1 Received: from [216.105.38.7] ([216.105.38.7:50508] helo=lists.sourceforge.net) by smtp53.gate.iad3a.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id 74/43-03599-84FE1B26; Tue, 21 Jun 2022 12:18:17 -0400 Received: from [127.0.0.1] (helo=sfs-ml-2.v29.lw.sourceforge.com) by sfs-ml-2.v29.lw.sourceforge.com with esmtp (Exim 4.94.2) (envelope-from ) id 1o3gYr-0008HC-0B; Tue, 21 Jun 2022 16:17:05 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-2.v29.lw.sourceforge.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1o3gYp-0008Gz-4U for openvpn-devel@lists.sourceforge.net; Tue, 21 Jun 2022 16:17:04 +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=q1A+Kvwz9pFF68UikFfhS3tzLIKrRscl/KIDS7Ryj4I=; b=GeYf1b4o5QvOSJ9GRoDQ4Pn0uW i9C0S7oQpOIXsvrwL9ibUEDVrPJTot8lt/x0Cf/JLmlI4JaQOzH5Ka8QY2Voirc0NisI9ftzY7edr jezzXKrtthe0JRuFI3Z3uKM7DmBxrXmARVSGLL+7scoBRqoe1+JuFCXLWYbe+i3nT8XE=; 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=q1A+Kvwz9pFF68UikFfhS3tzLIKrRscl/KIDS7Ryj4I=; b=KJVPMdjRR+0yf9GcPuhbi0YMTr SyRqeqUOe/vIiDYG6ouBOMU8r6GSR7W1VWye1aiLCO+i+lR3QKisznI5YaBuPG4Oq9I7y6b2DhJ65 kivSCWIlyf7REcFbqGwYS/0S0DysR9bKGFkipCH2aNBRiIzK4Ej3MGi3q82SRaE1X/aA=; Received: from mail.blinkt.de ([192.26.174.232]) by sfi-mx-1.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.94.2) id 1o3gYl-009Wj9-Gn for openvpn-devel@lists.sourceforge.net; Tue, 21 Jun 2022 16:17:03 +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 1o3gYc-000DmF-0r for openvpn-devel@lists.sourceforge.net; Tue, 21 Jun 2022 18:16:50 +0200 Received: (nullmailer pid 2873036 invoked by uid 10006); Tue, 21 Jun 2022 16:16:49 -0000 From: Arne Schwabe To: openvpn-devel@lists.sourceforge.net Date: Tue, 21 Jun 2022 18:16:45 +0200 Message-Id: <20220621161649.2872985-2-arne@rfc2549.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220621161649.2872985-1-arne@rfc2549.org> References: <20220621161649.2872985-1-arne@rfc2549.org> MIME-Version: 1.0 X-Spam-Report: Spam detection software, running on the system "util-spamd-1.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 function has only one usage and is so trivial that an extra function makes little sense anymore. frame_defined is no longer used, so remove the function. Signed-off-by: Arne Schwabe --- src/openvpn/init.c | 2 +- src/openvpn/mtu.h | 16 2 files changed, 1 insertion(+), 17 deletions(-) Content analysis details: (0.3 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: 1o3gYl-009Wj9-Gn Subject: [Openvpn-devel] [PATCH 2/6] Inline frame_add_to_extra_tun function and remove frame_defined 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 function has only one usage and is so trivial that an extra function makes little sense anymore. frame_defined is no longer used, so remove the function. Signed-off-by: Arne Schwabe Acked-by: Gert Doering --- src/openvpn/init.c | 2 +- src/openvpn/mtu.h | 16 ---------------- 2 files changed, 1 insertion(+), 17 deletions(-) diff --git a/src/openvpn/init.c b/src/openvpn/init.c index f06afc298..6cdcef628 100644 --- a/src/openvpn/init.c +++ b/src/openvpn/init.c @@ -3047,7 +3047,7 @@ do_init_frame(struct context *c) */ if (c->options.ce.tun_mtu_extra_defined) { - frame_add_to_extra_tun(&c->c2.frame, c->options.ce.tun_mtu_extra); + c->c2.frame.extra_tun += c->options.ce.tun_mtu_extra; } /* diff --git a/src/openvpn/mtu.h b/src/openvpn/mtu.h index 4b8feca7c..9db6cf26a 100644 --- a/src/openvpn/mtu.h +++ b/src/openvpn/mtu.h @@ -274,20 +274,4 @@ const char *format_extended_socket_error(int fd, int *mtu, struct gc_arena *gc); #endif -/* - * frame member adjustment functions - */ - -static inline void -frame_add_to_extra_tun(struct frame *frame, const int increment) -{ - frame->extra_tun += increment; -} - -static inline bool -frame_defined(const struct frame *frame) -{ - return frame->buf.payload_size > 0; -} - #endif /* ifndef MTU_H */