From patchwork Thu Apr 1 02:13:29 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arne Schwabe X-Patchwork-Id: 1688 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director7.mail.ord1d.rsapps.net ([172.30.191.6]) by backend30.mail.ord1d.rsapps.net with LMTP id eHEoBz3HZWCwSgAAIUCqbw (envelope-from ) for ; Thu, 01 Apr 2021 09:14:37 -0400 Received: from proxy5.mail.ord1d.rsapps.net ([172.30.191.6]) by director7.mail.ord1d.rsapps.net with LMTP id oDnPBj3HZWBTFQAAovjBpQ (envelope-from ) for ; Thu, 01 Apr 2021 09:14:37 -0400 Received: from smtp3.gate.ord1d ([172.30.191.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy5.mail.ord1d.rsapps.net with LMTPS id WI+ZBj3HZWCHMQAA8Zzt7w (envelope-from ) for ; Thu, 01 Apr 2021 09:14:37 -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: smtp3.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: 34a6d6a0-92ec-11eb-a110-5254006d4589-1-1 Received: from [216.105.38.7] ([216.105.38.7:60210] helo=lists.sourceforge.net) by smtp3.gate.ord1d.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id 98/E4-12681-C37C5606; Thu, 01 Apr 2021 09:14:36 -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.90_1) (envelope-from ) id 1lRx8v-0001B2-RK; Thu, 01 Apr 2021 13:13:49 +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 1lRx8t-0001As-Mz for openvpn-devel@lists.sourceforge.net; Thu, 01 Apr 2021 13:13:47 +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=2ckhPw6l3Edb/PrZAreEgKZgZ3aPhofSVsvs6m6ckOE=; b=X2cUdJZS8yZDf+Q3wWK7sCmtG4 p1WAqjtSmidjXS1Qi4z1v8GIulfv1b2+Ph8YvW+EidPEc2XTJ1tHOspmN7KHDoYIGPCJIq+3v7aSh kmCkTKoVgz8ZdRzg8FUlMWFOqHuXOgDRqZ1LRZ1ZDOwlNIaHEzkKlrt9GpUooWv9zIkA=; 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=2ckhPw6l3Edb/PrZAreEgKZgZ3aPhofSVsvs6m6ckOE=; b=VUfEwcK8PovBSAj8ZBUFLY6OSX 4LUA0JJI6gDIYaSWh2GjnqJWe+VzN0bEHUYq3LtQwXhxFrb+wFeTNYiTDgOOMZm2oH1C01V0bPYd+ 6QYcHJpZCikCOdVWiQUrgnNXj5vrJ1FzmzqosriseZy3aOSY5k/Pvl0Wm76oXy240OyI=; 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 1lRx8q-0003Uk-Cy for openvpn-devel@lists.sourceforge.net; Thu, 01 Apr 2021 13:13:47 +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 1lRx8k-000J89-5g for openvpn-devel@lists.sourceforge.net; Thu, 01 Apr 2021 15:13:38 +0200 Received: (nullmailer pid 3748 invoked by uid 10006); Thu, 01 Apr 2021 13:13:38 -0000 From: Arne Schwabe To: openvpn-devel@lists.sourceforge.net Date: Thu, 1 Apr 2021 15:13:29 +0200 Message-Id: <20210401131337.3684-7-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.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 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] X-Headers-End: 1lRx8q-0003Uk-Cy Subject: [Openvpn-devel] [PATCH 06/14] Remove pointless tun_adjust_frame_parameters function 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 functions seem to serve no purpose other than to add confusion. Signed-off-by: Arne Schwabe Acked-by: Gert Doering --- src/openvpn/init.c | 2 +- src/openvpn/tun.h | 10 ---------- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/src/openvpn/init.c b/src/openvpn/init.c index 1a6015452..f0ae0b7f1 100644 --- a/src/openvpn/init.c +++ b/src/openvpn/init.c @@ -3101,7 +3101,7 @@ do_init_frame(struct context *c) */ if (c->options.ce.tun_mtu_extra_defined) { - tun_adjust_frame_parameters(&c->c2.frame, c->options.ce.tun_mtu_extra); + frame_add_to_extra_tun(&c->c2.frame, c->options.ce.tun_mtu_extra); } /* diff --git a/src/openvpn/tun.h b/src/openvpn/tun.h index 902665cc6..7e8fb7647 100644 --- a/src/openvpn/tun.h +++ b/src/openvpn/tun.h @@ -315,16 +315,6 @@ void check_subnet_conflict(const in_addr_t ip, void warn_on_use_of_common_subnets(openvpn_net_ctx_t *ctx); -/* - * Inline functions - */ - -static inline void -tun_adjust_frame_parameters(struct frame *frame, int size) -{ - frame_add_to_extra_tun(frame, size); -} - /* * Should ifconfig be called before or after * tun dev open?