From patchwork Mon Apr 1 00:21:40 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christopher Schenk X-Patchwork-Id: 710 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director10.mail.ord1d.rsapps.net ([172.27.255.7]) by backend30.mail.ord1d.rsapps.net with LMTP id aLgEA570oVxeDgAAIUCqbw for ; Mon, 01 Apr 2019 07:23:10 -0400 Received: from proxy1.mail.iad3a.rsapps.net ([172.27.255.7]) by director10.mail.ord1d.rsapps.net with LMTP id oHiqAJ70oVzsUwAApN4f7A ; Mon, 01 Apr 2019 07:23:10 -0400 Received: from smtp30.gate.iad3a ([172.27.255.7]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy1.mail.iad3a.rsapps.net with LMTP id 2DRONp30oVxsXAAA8TVjwQ ; Mon, 01 Apr 2019 07:23:09 -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: smtp30.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=fail (p=none; dis=none) header.from=mail.uni-paderborn.de X-Suspicious-Flag: YES X-Classification-ID: 86e6a880-5470-11e9-8971-525400089674-1-1 Received: from [216.105.38.7] ([216.105.38.7:39504] helo=lists.sourceforge.net) by smtp30.gate.iad3a.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id C9/76-09420-D94F1AC5; Mon, 01 Apr 2019 07:23:09 -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.90_1) (envelope-from ) id 1hAv0w-0002MG-1A; Mon, 01 Apr 2019 11:22:06 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-2.v29.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.90_1) (envelope-from ) id 1hAv0u-0002M6-II for openvpn-devel@lists.sourceforge.net; Mon, 01 Apr 2019 11:22: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:Cc:To:From:Sender:Reply-To: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=shQVOUOe2lWWt5bRuVkkTuNxK7dXnqjzodrMuZ2s6ak=; b=PA0syLQ7H33Zqhtv+JnxwIKAGg eoCpGfowF03+g4dA2eAksAoyaLoXbLd1QnOTUBWwKaLS+9PLxPkXM9PElhcorEMvIbVBoeZ9H2RWt mTiKXGdHrbWCAU5MsZO1TcenkY3qPvrPu4JUi12Q3PGLSNPHtYPN+cv/+hHxFtO2Kud0=; 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:Cc:To:From:Sender:Reply-To: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=shQVOUOe2lWWt5bRuVkkTuNxK7dXnqjzodrMuZ2s6ak=; b=aU8ashNGCAixkCNoPF37JVVfG6 ab5u6b1nGE3eDALVoISmtCN699smyGsf0prCT/Qjc7Rohs9d8xtQvSn+5gXPGXJZ16SyV/pCsygIh vnZCjz5QPrpusg6UEtQE1K2MfqQkfWnILaF8mzV4vd6hxwZcMDfkxAkqjLWbTu/Bplyo=; Received: from mail.uni-paderborn.de ([131.234.142.9]) by sfi-mx-1.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.90_1) id 1hAv0t-006eb0-1I for openvpn-devel@lists.sourceforge.net; Mon, 01 Apr 2019 11:22:04 +0000 Received: from tweenies.uni-paderborn.de ([131.234.189.21] helo=localhost.localdomain) by mail.uni-paderborn.de with esmtp (Exim 4.89 hoth) id 1hAv0m-0000Gp-Qb for openvpn-devel@lists.sourceforge.net; Mon, 01 Apr 2019 13:21:56 +0200 Received: from mail.uni-paderborn.de by tweenies with queue id 3212994-4 for openvpn-devel@lists.sourceforge.net; Mon, 01 Apr 2019 11:21:55 GMT From: Christopher Schenk To: openvpn-devel@lists.sourceforge.net Date: Mon, 1 Apr 2019 13:21:40 +0200 Message-Id: <20190401112140.13212-4-cschenk@mail.uni-paderborn.de> X-Mailer: git-send-email 2.21.0.windows.1 In-Reply-To: <20190401112140.13212-1-cschenk@mail.uni-paderborn.de> References: <20190329193805.GQ31008@greenie.muc.de> <20190401112140.13212-1-cschenk@mail.uni-paderborn.de> MIME-Version: 1.0 X-PMX-Version: 6.4.6.2792898, Antispam-Engine: 2.7.2.2107409, Antispam-Data: 2019.4.1.111216, AntiVirus-Engine: 5.58.0, AntiVirus-Data: 2019.2.22.5580002 X-IMT-Spam-Score: 0.0 () X-IMT-Authenticated-Sender: X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. See http://spamassassin.org/tag/ for more details. -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 AWL AWL: Adjusted score from AWL reputation of From: address X-Headers-End: 1hAv0t-006eb0-1I Subject: [Openvpn-devel] [PATCH 4/4] Simplified if statements for better readability 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 --- src/openvpn/tun.c | 58 ++++++++++++----------------------------------- 1 file changed, 14 insertions(+), 44 deletions(-) diff --git a/src/openvpn/tun.c b/src/openvpn/tun.c index 9fe8444f..20e661a7 100644 --- a/src/openvpn/tun.c +++ b/src/openvpn/tun.c @@ -69,7 +69,7 @@ static void netsh_ifconfig(const struct tuntap_options *to, const in_addr_t netmask, const unsigned int flags); -static void windows_set_mtu(const int iface_indey, +static void windows_set_mtu(const int iface_index, short family, const int mtu); @@ -213,7 +213,7 @@ do_set_mtu_service(const struct tuntap *tt, const short family, const int mtu) ack_message_t ack; struct gc_arena gc = gc_new(); HANDLE pipe = tt->options.msg_channel; - + char *family_name = (family == AF_INET6) ? "IPv6" : "IPv4"; set_mtu_message_t mtu_msg = { .header = { msg_set_mtu, @@ -230,31 +230,15 @@ do_set_mtu_service(const struct tuntap *tt, const short family, const int mtu) goto out; } - if (family == AF_INET) + if (ack.error_number != NO_ERROR) { - if (ack.error_number != NO_ERROR) - { - msg(M_NONFATAL, "TUN: setting IPv4 mtu using service failed: %s [status=%u if_index=%d]", - strerror_win32(ack.error_number, &gc), ack.error_number, mtu_msg.iface.index); - } - else - { - msg(M_INFO, "IPv4 MTU set to %d on interface %d using service", mtu, mtu_msg.iface.index); - ret = true; - } + msg(M_NONFATAL, "TUN: setting %s mtu using service failed: %s [status=%u if_index=%d]", + family_name, strerror_win32(ack.error_number, &gc), ack.error_number, mtu_msg.iface.index); } - else if (family == AF_INET6) + else { - if (ack.error_number != NO_ERROR) - { - msg(M_NONFATAL, "TUN: setting IPv6 mtu using service failed: %s [status=%u if_index=%d]", - strerror_win32(ack.error_number, &gc), ack.error_number, mtu_msg.iface.index); - } - else - { - msg(M_INFO, "IPv6 MTU set to %d on interface %d using service", mtu, mtu_msg.iface.index); - ret = true; - } + msg(M_INFO, "%s MTU set to %d on interface %d using service", family_name, mtu, mtu_msg.iface.index); + ret = true; } out: @@ -5313,35 +5297,21 @@ windows_set_mtu(const int iface_index, const short family, DWORD err = 0; struct gc_arena gc = gc_new(); MIB_IPINTERFACE_ROW row; + char *family_name = (family == AF_INET6) ? "IPv6" : "IPv4"; InitializeIpInterfaceEntry(&row); row.Family = family; row.InterfaceIndex = iface_index; row.NlMtu = mtu; err = SetIpInterfaceEntry(&row); - if (family == AF_INET) + if (err != NO_ERROR) { - if (err != NO_ERROR) - { - msg(M_WARN, "TUN: Setting IPv4 mtu failed: %s [status=%u if_index=%d]", - strerror_win32(err, &gc), err, iface_index); - } - else - { - msg(M_INFO, "Successfully set IPv4 mtu on interface %d", iface_index); - } + msg(M_WARN, "TUN: Setting %s mtu failed: %s [status=%u if_index=%d]", + family_name, strerror_win32(err, &gc), err, iface_index); } - else if (family == AF_INET6) + else { - if (err != NO_ERROR) - { - msg(M_WARN, "TUN: Setting IPv6 mtu failed: %s [status=%u if_index=%d]", - strerror_win32(err, &gc), err, iface_index); - } - else - { - msg(M_INFO, "Successfully set IPv6 mtu on interface %d", iface_index); - } + msg(M_INFO, "Successfully set %s mtu on interface %d", family_name, iface_index); } }