From patchwork Tue Oct 2 10:01:13 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Selva Nair X-Patchwork-Id: 474 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director8.mail.ord1d.rsapps.net ([172.31.255.6]) by backend30.mail.ord1d.rsapps.net with LMTP id uFEQLOTOs1t5TwAAIUCqbw for ; Tue, 02 Oct 2018 16:02:44 -0400 Received: from proxy2.mail.iad3b.rsapps.net ([172.31.255.6]) by director8.mail.ord1d.rsapps.net with LMTP id MCW4KeTOs1seTAAAfY0hYg ; Tue, 02 Oct 2018 16:02:44 -0400 Received: from smtp39.gate.iad3b ([172.31.255.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy2.mail.iad3b.rsapps.net with LMTP id kAjtJOTOs1tLRwAAvAZTew ; Tue, 02 Oct 2018 16:02:44 -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: smtp39.gate.iad3b.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; dkim=fail (signature verification failed) header.d=gmail.com; dmarc=fail (p=none; dis=none) header.from=gmail.com X-Suspicious-Flag: YES X-Classification-ID: 1fbe85f4-c67e-11e8-9673-5254002be87c-1-1 Received: from [216.105.38.7] ([216.105.38.7:2767] helo=lists.sourceforge.net) by smtp39.gate.iad3b.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id 68/4F-31203-4EEC3BB5; Tue, 02 Oct 2018 16:02:44 -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 1g7QrK-0005mE-1D; Tue, 02 Oct 2018 20:01:30 +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 1g7QrI-0005m8-3J for openvpn-devel@lists.sourceforge.net; Tue, 02 Oct 2018 20:01:28 +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:Cc: To:From:Sender:Reply-To: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=ud5z99or8qgt9LuidPJlO3bMXFQbHP1x8vuywVmQK/A=; b=AKOHbpV+w7biHDG6ouMuOSSaVa CyfptKOJcXWAdYfYhGbwQ5qKSpuLfXCKI/rHyb+plHf3rVw30l2GKhqXmPY/7GejPDf6sjykzTrNo SYsaUkmEKGQQmWOQTDBOZbf7ZChSEKM0Bnz33x5TR/FZ4B6kbvAiuyvLoXgDRv3rMbxQ=; 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:Cc:To:From:Sender:Reply-To :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=ud5z99or8qgt9LuidPJlO3bMXFQbHP1x8vuywVmQK/A=; b=JUQTYWSX1sh5PABgc5bQTmYV4B 1hWDGU6iTOKew+jl9FA4Zgv/7MoZVQedzyB4QN2V4MA/r9+Q2ymu1FSI52ybnVHTWgbi0aBKvzEaJ gI+BKqD7rzgLe4Mc21h92iHexSYlcJ+AGXOrH0q4S+bJT1bWHZ0iu4bNf12nAfRB6YII=; Received: from mail-io1-f65.google.com ([209.85.166.65]) by sfi-mx-4.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.90_1) id 1g7QrG-00B61O-LX for openvpn-devel@lists.sourceforge.net; Tue, 02 Oct 2018 20:01:28 +0000 Received: by mail-io1-f65.google.com with SMTP id k19-v6so3149672iom.1 for ; Tue, 02 Oct 2018 13:01:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=ud5z99or8qgt9LuidPJlO3bMXFQbHP1x8vuywVmQK/A=; b=By6VKe2b/jOAJ3/6BtCuMfWAEc5YVeR+jxmSE7NhD+TqzRpx/q2yKuGAGZssey/B07 tQKskCe4EhbkK405t1Qje8yGUgfVA32Bp4VdJfA56Wa8JT0SjLUwPDHbwKke+tPCcEYP HoY5wjB6EexHV44qy8oIlAWHY4js7Ixq0uzYmOE1hoc61hd7+Y0/SOTBaC6+n0QUoLht U1KNsvVntyhyWfq/fa8T+fE8eoojCBhBBni6yzOkpCK/LVEGC4gh2kSnITm4XS4EdMTH dQnOZqfexJ8uJRshodWVbah8KKGR6ZO46cKcI6C27o4cpzb51FrCbvtMMc3xr9OD8zHW A0ww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=ud5z99or8qgt9LuidPJlO3bMXFQbHP1x8vuywVmQK/A=; b=Gm6OaE9rZILn1OGgd2H4Jz4Jycu5qyuzq5Qpt0JC0plabYLYsoDc1uHmaI+tGo0a+q epXk+Wr7L4fKYwwH11YjRTDG7/WQQcyeqRYwtPOLfW3MCiKxg5zxvdM1YmdGNpmVy/3+ RjsZoCvw21ESqZnYy0ThegWrC3OlHvOT4YtfN87Y5QKAGNrSjG2LIiYRMGSiPR4Ahn/j f2gEWNHIPd6qZgX8/G9zVwWMgaBRLJ5cb6RVfyMi4ywtCigWKvHiI9CwyZ0NzM0f4mmt 0XRBh+SIKvB4w3D1M+4vPAwAXcvQi7W/GlywL9aXiJlUhBDNhve3gpdpT+lN+FNN0x5k 8qdA== X-Gm-Message-State: ABuFfoiRr1oNaCkJxHduqPLVeWK23ZdOdgnvjTrn+7W2+I6SYpi4m6mk Zlfs1cQ+DhoEZIb2j+4dATDnA6YJX4A= X-Google-Smtp-Source: ACcGV60PRWHwDiMbIaZ9Z4HUmem+uxqVT7E0lZtpp6zWjdSiJmJ1VnyVZKEcYZ3IiOXsrJr1z0Ap5g== X-Received: by 2002:a6b:1a11:: with SMTP id a17-v6mr11296203ioa.223.1538510480581; Tue, 02 Oct 2018 13:01:20 -0700 (PDT) Received: from saturn.home.sansel.ca (CPE40167ea0e1c2-CM788df74daaa0.cpe.net.cable.rogers.com. [99.228.215.92]) by smtp.gmail.com with ESMTPSA id o201-v6sm6342961ito.41.2018.10.02.13.01.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 02 Oct 2018 13:01:20 -0700 (PDT) From: selva.nair@gmail.com To: openvpn-devel@lists.sourceforge.net Date: Tue, 2 Oct 2018 16:01:13 -0400 Message-Id: <1538510474-27602-2-git-send-email-selva.nair@gmail.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1538510474-27602-1-git-send-email-selva.nair@gmail.com> References: <1538229228-10620-1-git-send-email-selva.nair@gmail.com> <1538510474-27602-1-git-send-email-selva.nair@gmail.com> X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. See http://spamassassin.org/tag/ for more details. -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [209.85.166.65 listed in list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (selva.nair[at]gmail.com) -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.166.65 listed in wl.mailspike.net] 0.0 AWL AWL: Adjusted score from AWL reputation of From: address X-Headers-End: 1g7QrG-00B61O-LX Subject: [Openvpn-devel] [PATCH 2/3 v2] Enable dhcp on tap adapter using 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: , MIME-Version: 1.0 Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox From: Selva Nair Currently, if dhcp on the TAP interface is disabled, OpenVPN on Windows tries to enable it using netsh but that succeeds only when run with admin privileges. When interactive service is available, delegate this task to the service. Trac #1111 Tested on Windows 7 Signed-off-by: Selva Nair Acked-by: Gert Doering --- v2 changes: As suggested by Lev - In comment, clarify the 10 chars room is for printing 32 bit int - Use get_win_sys_path() added in the accompanying patch (1 of 3) Refactoring of writing to the message channel is in the following patch. include/openvpn-msg.h | 8 ++++++- src/openvpn/tun.c | 53 ++++++++++++++++++++++++++++++++++++++++++- src/openvpnserv/interactive.c | 47 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 106 insertions(+), 2 deletions(-) diff --git a/include/openvpn-msg.h b/include/openvpn-msg.h index 82ecfe8..66177a2 100644 --- a/include/openvpn-msg.h +++ b/include/openvpn-msg.h @@ -37,7 +37,8 @@ typedef enum { msg_flush_neighbors, msg_add_block_dns, msg_del_block_dns, - msg_register_dns + msg_register_dns, + msg_enable_dhcp, } message_type_t; typedef struct { @@ -111,4 +112,9 @@ typedef struct { interface_t iface; } block_dns_message_t; +typedef struct { + message_header_t header; + interface_t iface; +} enable_dhcp_message_t; + #endif /* ifndef OPENVPN_MSG_H_ */ diff --git a/src/openvpn/tun.c b/src/openvpn/tun.c index 50f158c..a2d5315 100644 --- a/src/openvpn/tun.c +++ b/src/openvpn/tun.c @@ -5203,6 +5203,49 @@ netsh_enable_dhcp(const struct tuntap_options *to, argv_reset(&argv); } +/* Enable dhcp on tap adapter using iservice */ +static bool +service_enable_dhcp(const struct tuntap *tt) +{ + DWORD len; + bool ret = false; + ack_message_t ack; + struct gc_arena gc = gc_new(); + HANDLE pipe = tt->options.msg_channel; + + enable_dhcp_message_t dhcp = { + .header = { + msg_enable_dhcp, + sizeof(enable_dhcp_message_t), + 0 + }, + .iface = { .index = tt->adapter_index, .name = "" } + }; + + if (!WriteFile(pipe, &dhcp, sizeof(dhcp), &len, NULL) + || !ReadFile(pipe, &ack, sizeof(ack), &len, NULL)) + { + msg(M_WARN, "Enable_dhcp: could not talk to service: %s [%lu]", + strerror_win32(GetLastError(), &gc), GetLastError()); + goto out; + } + + if (ack.error_number != NO_ERROR) + { + msg(M_NONFATAL, "TUN: enabling dhcp using service failed: %s [status=%u if_index=%d]", + strerror_win32(ack.error_number, &gc), ack.error_number, dhcp.iface.index); + } + else + { + msg(M_INFO, "DHCP enabled on interface %d using service", dhcp.iface.index); + ret = true; + } + +out: + gc_free(&gc); + return ret; +} + /* * Return a TAP name for netsh commands. */ @@ -5683,7 +5726,15 @@ open_tun(const char *dev, const char *dev_type, const char *dev_node, struct tun */ if (dhcp_status(tt->adapter_index) == DHCP_STATUS_DISABLED) { - netsh_enable_dhcp(&tt->options, tt->actual_name); + /* try using the service if available, else directly execute netsh */ + if (tt->options.msg_channel) + { + service_enable_dhcp(tt); + } + else + { + netsh_enable_dhcp(&tt->options, tt->actual_name); + } } dhcp_masq = true; dhcp_masq_post = true; diff --git a/src/openvpnserv/interactive.c b/src/openvpnserv/interactive.c index 0489684..c0fdc19 100644 --- a/src/openvpnserv/interactive.c +++ b/src/openvpnserv/interactive.c @@ -1165,6 +1165,45 @@ out: return err; } +static DWORD +HandleEnableDHCPMessage(const enable_dhcp_message_t *dhcp) +{ + 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 ipv4 set address name=$if_index source=dhcp + */ + const wchar_t *fmt = L"netsh interface ipv4 set address name=\"%d\" source=dhcp"; + + /* max cmdline length in wchars -- include room for if index: + * 10 chars for 32 bit int in decimal and +1 for NUL + */ + size_t ncmdline = wcslen(fmt) + 10 + 1; + wchar_t *cmdline = malloc(ncmdline*sizeof(wchar_t)); + if (!cmdline) + { + err = ERROR_OUTOFMEMORY; + return err; + } + + openvpn_sntprintf(cmdline, ncmdline, fmt, dhcp->iface.index); + + err = ExecCommand(argv0, cmdline, timeout); + + /* Note: This could fail if dhcp is already enabled, so the caller + * may not want to treat errors as FATAL. + */ + + free(cmdline); + return err; +} + static VOID HandleMessage(HANDLE pipe, DWORD bytes, DWORD count, LPHANDLE events, undo_lists_t *lists) { @@ -1176,6 +1215,7 @@ HandleMessage(HANDLE pipe, DWORD bytes, DWORD count, LPHANDLE events, undo_lists flush_neighbors_message_t flush_neighbors; block_dns_message_t block_dns; dns_cfg_message_t dns; + enable_dhcp_message_t dhcp; } msg; ack_message_t ack = { .header = { @@ -1236,6 +1276,13 @@ HandleMessage(HANDLE pipe, DWORD bytes, DWORD count, LPHANDLE events, undo_lists ack.error_number = HandleDNSConfigMessage(&msg.dns, lists); break; + case msg_enable_dhcp: + if (msg.header.size == sizeof(msg.dhcp)) + { + ack.error_number = HandleEnableDHCPMessage(&msg.dhcp); + } + break; + default: ack.error_number = ERROR_MESSAGE_TYPE; MsgToEventLog(MSG_FLAGS_ERROR, TEXT("Unknown message type %d"), msg.header.type);