From patchwork Mon Apr 1 00:21:38 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christopher Schenk X-Patchwork-Id: 709 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director8.mail.ord1d.rsapps.net ([172.27.255.54]) by backend30.mail.ord1d.rsapps.net with LMTP id mA1vDp30oVwtcAAAIUCqbw for ; Mon, 01 Apr 2019 07:23:09 -0400 Received: from proxy7.mail.iad3a.rsapps.net ([172.27.255.54]) by director8.mail.ord1d.rsapps.net with LMTP id sFUbDJ30oVzeSwAAfY0hYg ; Mon, 01 Apr 2019 07:23:09 -0400 Received: from smtp13.gate.iad3a ([172.27.255.54]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy7.mail.iad3a.rsapps.net with LMTP id 8Mi0BZ30oVwhcwAAnPvY+A ; 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: smtp13.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: 862c163c-5470-11e9-8f0a-5254004b83b1-1-1 Received: from [216.105.38.7] ([216.105.38.7:51431] helo=lists.sourceforge.net) by smtp13.gate.iad3a.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id AF/6B-27142-C94F1AC5; Mon, 01 Apr 2019 07:23:08 -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 1hAv0v-000788-E3; Mon, 01 Apr 2019 11:22:05 +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 1hAv0u-00077p-Db 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=WIaSfy2qTb2LRdzNMJtDw5wYpZtOSVPb2jXzdomTlIw=; b=NtLs9r9eY42Wa4sjXdMc8sbl/u 0ItUu9Xbtl8f5FzQyhucaAlV5W/d1h3qUsVwHsWT4cw5ldvS0AD8izV+xj42ISQXpvgszlr6IzgKn yt1bGs+GJh7YNTV1Q6NqOn2EkWi/hn21xgWUlAQMbVo6T64cGIf5zlCON0t2vZb8rN5Q=; 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=WIaSfy2qTb2LRdzNMJtDw5wYpZtOSVPb2jXzdomTlIw=; b=N6nEUT0u06T2Q9h31mv2r7yZkQ qvHyxgJ5J+1q4iKnoCsA+f8ZM2nL4xcnlYYvZ9ZOuACL+35lAMglYkEVdX3Q+0tS7flZZzFCMBSVi tpyC0FrzLojvkY3//oXkgDD4WtTO7MocOiQGIqstX5XDn5toylTMZVCDTUvp7RYsPGEc=; Received: from mail.uni-paderborn.de ([131.234.142.9]) by sfi-mx-4.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.90_1) id 1hAv0s-009TjC-Gz 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 nylar) id 1hAv0j-0001t3-OS for openvpn-devel@lists.sourceforge.net; Mon, 01 Apr 2019 13:21:53 +0200 Received: from mail.uni-paderborn.de by tweenies with queue id 3212993-4 for openvpn-devel@lists.sourceforge.net; Mon, 01 Apr 2019 11:21:52 GMT From: Christopher Schenk To: openvpn-devel@lists.sourceforge.net Date: Mon, 1 Apr 2019 13:21:38 +0200 Message-Id: <20190401112140.13212-2-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.1 AWL AWL: Adjusted score from AWL reputation of From: address X-Headers-End: 1hAv0s-009TjC-Gz Subject: [Openvpn-devel] [PATCH 2/4] Setting MTU also via interactive service 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 --- include/openvpn-msg.h | 8 +++++ src/openvpn/tun.c | 67 ++++++++++++++++++++++++++++++++++- src/openvpnserv/interactive.c | 50 ++++++++++++++++++++++++++ 3 files changed, 124 insertions(+), 1 deletion(-) diff --git a/include/openvpn-msg.h b/include/openvpn-msg.h index 66177a21..f59c5a21 100644 --- a/include/openvpn-msg.h +++ b/include/openvpn-msg.h @@ -39,6 +39,7 @@ typedef enum { msg_del_block_dns, msg_register_dns, msg_enable_dhcp, + msg_set_mtu, } message_type_t; typedef struct { @@ -117,4 +118,11 @@ typedef struct { interface_t iface; } enable_dhcp_message_t; +typedef struct { + message_header_t header; + interface_t iface; + short family; + int mtu; +} set_mtu_message_t; + #endif /* ifndef OPENVPN_MSG_H_ */ diff --git a/src/openvpn/tun.c b/src/openvpn/tun.c index 93d028c8..b0230a7c 100644 --- a/src/openvpn/tun.c +++ b/src/openvpn/tun.c @@ -207,6 +207,63 @@ out: return ret; } +static bool +do_set_mtu_service(const struct tuntap *tt, const short family, const int mtu) +{ + DWORD len; + bool ret = false; + ack_message_t ack; + struct gc_arena gc = gc_new(); + HANDLE pipe = tt->options.msg_channel; + + set_mtu_message_t mtu_msg = { + .header = { + msg_set_mtu, + sizeof(set_mtu_message_t), + 0 + }, + .iface = {.index = tt->adapter_index,.name = tt->actual_name }, + .mtu = mtu, + .family = family + }; + + if (!send_msg_iservice(pipe, &mtu_msg, sizeof(mtu_msg), &ack, "Set_mtu")) + { + goto out; + } + + if (family == AF_INET) + { + 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; + } + } + else if (family == AF_INET6) + { + 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; + } + } + +out: + gc_free(&gc); + return ret; +} + #endif /* ifdef _WIN32 */ #ifdef TARGET_SOLARIS @@ -990,6 +1047,7 @@ do_ifconfig_ipv6(struct tuntap *tt, const char *ifname, int tun_mtu, { do_address_service(true, AF_INET6, tt); do_dns6_service(true, tt); + do_set_mtu_service(tt, AF_INET6, tun_mtu); } else { @@ -1400,7 +1458,14 @@ do_ifconfig_ipv4(struct tuntap *tt, const char *ifname, int tun_mtu, tt->adapter_netmask, NI_IP_NETMASK|NI_OPTIONS); break; } - netsh_set_mtu_ipv4(ifname, tun_mtu); + if (tt->options.msg_channel) + { + do_set_mtu_service(tt, AF_INET, tun_mtu); + } + else + { + netsh_set_mtu_ipv4(ifname, tun_mtu); + } } #else /* if defined(TARGET_LINUX) */ diff --git a/src/openvpnserv/interactive.c b/src/openvpnserv/interactive.c index 623c3ff7..31e4afa0 100644 --- a/src/openvpnserv/interactive.c +++ b/src/openvpnserv/interactive.c @@ -1198,6 +1198,49 @@ HandleEnableDHCPMessage(const enable_dhcp_message_t *dhcp) return err; } +static DWORD +HandleMTUMessage(const set_mtu_message_t *mtu) +{ + DWORD err = 0; + DWORD timeout = 5000; /* in milli seconds */ + wchar_t argv0[MAX_PATH]; + + /* Path of netsh */ + swprintf(argv0, _countof(argv0), L"%s\\%s", get_win_sys_path(), L"netsh.exe"); + argv0[_countof(argv0) - 1] = L'\0'; + + /* cmd template: + * netsh interface $family set subinterface "$if_name" mtu=$mtu + */ + const wchar_t *fmt; + if (mtu->family == AF_INET) + { + fmt = L"netsh interface ipv4 set subinterface \"%d\" mtu= %d"; + } + else if (mtu->family == AF_INET6) + { + fmt = L"netsh interface ipv6 set subinterface \"%d\" mtu= %d"; + } + + /* max cmdline length in wchars -- include room for if index: + * 20 chars for two 32 bit int in decimal and +1 for NUL + */ + size_t ncmdline = wcslen(fmt) + 20 + 1; + wchar_t *cmdline = malloc(ncmdline * sizeof(wchar_t)); + if (!cmdline) + { + err = ERROR_OUTOFMEMORY; + return err; + } + + openvpn_sntprintf(cmdline, ncmdline, fmt, mtu->iface.index, mtu->mtu); + + err = ExecCommand(argv0, cmdline, timeout); + + free(cmdline); + return err; +} + static VOID HandleMessage(HANDLE pipe, DWORD bytes, DWORD count, LPHANDLE events, undo_lists_t *lists) { @@ -1210,6 +1253,7 @@ HandleMessage(HANDLE pipe, DWORD bytes, DWORD count, LPHANDLE events, undo_lists block_dns_message_t block_dns; dns_cfg_message_t dns; enable_dhcp_message_t dhcp; + set_mtu_message_t mtu; } msg; ack_message_t ack = { .header = { @@ -1276,6 +1320,12 @@ HandleMessage(HANDLE pipe, DWORD bytes, DWORD count, LPHANDLE events, undo_lists ack.error_number = HandleEnableDHCPMessage(&msg.dhcp); } break; + case msg_set_mtu: + if (msg.header.size == sizeof(msg.mtu)) + { + ack.error_number = HandleMTUMessage(&msg.mtu); + } + break; default: ack.error_number = ERROR_MESSAGE_TYPE;