From patchwork Wed Sep 2 11:36:43 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lev Stipakov X-Patchwork-Id: 1411 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director7.mail.ord1d.rsapps.net ([172.30.191.6]) by backend41.mail.ord1d.rsapps.net with LMTP id aHBpCTOSUF+XVwAAqwncew for ; Thu, 03 Sep 2020 02:50:27 -0400 Received: from proxy3.mail.ord1d.rsapps.net ([172.30.191.6]) by director7.mail.ord1d.rsapps.net with LMTP id +GVSCTOSUF9uIAAAovjBpQ (envelope-from ) for ; Thu, 03 Sep 2020 02:50:27 -0400 Received: from smtp9.gate.ord1c ([172.30.191.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy3.mail.ord1d.rsapps.net with LMTPS id sGkGCDOSUF/ZAgAA7WKfLA (envelope-from ) for ; Thu, 03 Sep 2020 02:50:27 -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: smtp9.gate.ord1c.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: bf394fb8-edb1-11ea-96ed-0026b95bddb7-1-1 Received: from [216.105.38.7] ([216.105.38.7:55292] helo=lists.sourceforge.net) by smtp9.gate.ord1c.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id 9B/85-16801-232905F5; Thu, 03 Sep 2020 02:50:26 -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 1kDj3p-0003Gv-JO; Thu, 03 Sep 2020 06:49:29 +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 1kDj3n-0003Gn-Mb for openvpn-devel@lists.sourceforge.net; Thu, 03 Sep 2020 06:49:27 +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=oHkXl3D7iyfW4ett5BP4sSK5Hthr7PvC93ZE79w/1f0=; b=T1HroOdnSmRTNSRSmFIQsnhKKP pyIELhtSNRcP/YhYRQ82u+2knkUBtDAoLTBuVj6EdsXZePnuO8waaC9YQIIvj07qlHkXCpv8rwv2y JNuzMvjZdFGlYy6OT0fDg+Z5lmOqhICYEsF+iitDjnlQaw+Av3zumbH4kUCJV3fnVWCA=; 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=oHkXl3D7iyfW4ett5BP4sSK5Hthr7PvC93ZE79w/1f0=; b=E61q7SP06OgAsYpI3ZCxEfgAaM 8FXaLfd8UX8KMc3nvbb0IEQpIBtB49NmhCx/tPtkLCY8e5QDXVdj060QpYEudoxgz+Kr5lsO3Hqwa jbSbdCQ56nmmDWXBqqYdyXaD1E8kauEwDrv7/h0y1CGD2A764ebP2QBjoiogrBwNTPds=; Received: from mail-wr1-f43.google.com ([209.85.221.43]) by sfi-mx-1.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.92.2) id 1kDj3i-00A8R7-G1 for openvpn-devel@lists.sourceforge.net; Thu, 03 Sep 2020 06:49:27 +0000 Received: by mail-wr1-f43.google.com with SMTP id o5so1829967wrn.13 for ; Wed, 02 Sep 2020 23:49:22 -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=oHkXl3D7iyfW4ett5BP4sSK5Hthr7PvC93ZE79w/1f0=; b=ufoQ9oVigez/1th/2Ht2Nb4ku3yzvX8HrWB9gzhEEpFDMb7Uh2/drZWzdSBU/dKL1W ZJc5Un89PG1l8jvspJ0uX4t4f9HKZfHljRNe8i6FTMRPKw3IWuU6nml6p53mInqkEwKh /p8uOL6ERxb1p7l1DmgLmsQamUg69ZMEDy3BQDsuk07bphrkaYxpvNsC7QPC7/jfnAu9 HRakq9kHbR3SnYNAdcK56nzYOpq37YwcwZGWuDrNK1CcuPD1MqUwRfWbLPAqRqH5c/8Y Ucop21q7LNPvZTNqq41AoUCoPZnYjYoNu1zCdmfFqbjqq1zH85vvTZhMHijeNWryE3U0 8ajA== 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=oHkXl3D7iyfW4ett5BP4sSK5Hthr7PvC93ZE79w/1f0=; b=HH1HFtjq/OrKWZBw7l580PbBsUJKJMB1eiLm+5WOlACivzkAKPVm2e9Q2zLiO+/PP3 WLRsl14QWIuFfxvpTuUmZUCyerIvZxlukVhh2/Qyb3YjdFhwRhMQza/gaRUT/CupwBw7 glUBOm0stjK3orUBbAZs7abTvXyHezuLsiTVJCpvZkNVKMM7NU44053WG2eOMfSg+CAS 99gWj1HfAdDqs9/X2wKPbD6rllV/U0LNNUkxwhhoyAAEzHWkIwsw1V97O8PhYQganTGm mv3lBhsN9vObFFjKdG6CzXxgGfKtkB6jPww96EODx+2mLjSt2cc17NLnjB8wGX5yNUNR RbpA== X-Gm-Message-State: AOAM532o0FKkY1+pKkzsdyUnV5OtcxvN430hAImab31ky42dUaaifWv8 GdjLQ4hefAXN8iWRKj5Ks9wlp84O13ATrw== X-Google-Smtp-Source: ABdhPJwDb/wyUM3QQsJmlugasBH51n5EqGn0OstdK3WdwlcqKta6UT5f4eHBhT3MqiceJQto1BNvBg== X-Received: by 2002:a5d:458e:: with SMTP id p14mr709222wrq.61.1599115755700; Wed, 02 Sep 2020 23:49:15 -0700 (PDT) Received: from LAPTOP-4L3N7KFS.localdomain (nat2.panoulu.net. [185.38.2.2]) by smtp.gmail.com with ESMTPSA id c14sm2809125wrv.12.2020.09.02.23.49.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Sep 2020 23:49:14 -0700 (PDT) From: Lev Stipakov To: openvpn-devel@lists.sourceforge.net Date: Thu, 3 Sep 2020 00:36:43 +0300 Message-Id: <20200902213643.401-1-lstipakov@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: References: X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. See http://spamassassin.org/tag/ for more details. 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: openvpn.net] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (lstipakov[at]gmail.com) -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.221.43 listed in wl.mailspike.net] 1.1 DATE_IN_PAST_06_12 Date: is 6 to 12 hours before Received: date -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an 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_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.221.43 listed in list.dnswl.org] X-Headers-End: 1kDj3i-00A8R7-G1 Subject: [Openvpn-devel] [PATCH v2] openvpnmsica: make adapter renaming non-fatal 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: , Cc: Lev Stipakov MIME-Version: 1.0 Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox From: Lev Stipakov For some users renaming adapter Local Area Connection > OpenVPN TAP-Windows6 mysteriously fails, see https://github.com/OpenVPN/openvpn-build/issues/187 Since renaming is just a "nice to have", make it non-fatal and, in case of error, only log message and don't display messagebox. Signed-off-by: Lev Stipakov Acked-by: Simon Rozman --- v2: only log error, don't display messagebox src/openvpnmsica/dllmain.c | 2 +- src/openvpnmsica/openvpnmsica.c | 9 +++------ src/tapctl/main.c | 2 +- src/tapctl/tap.c | 11 +++++++---- src/tapctl/tap.h | 6 +++++- 5 files changed, 17 insertions(+), 13 deletions(-) diff --git a/src/openvpnmsica/dllmain.c b/src/openvpnmsica/dllmain.c index 201fd9af..34946ed8 100644 --- a/src/openvpnmsica/dllmain.c +++ b/src/openvpnmsica/dllmain.c @@ -193,6 +193,6 @@ x_msg_va(const unsigned int flags, const char *format, va_list arglist) } } - MsiProcessMessage(s->hInstall, INSTALLMESSAGE_ERROR, hRecordProg); + MsiProcessMessage(s->hInstall, (flags & M_WARN) ? INSTALLMESSAGE_INFO : INSTALLMESSAGE_ERROR, hRecordProg); MsiCloseHandle(hRecordProg); } diff --git a/src/openvpnmsica/openvpnmsica.c b/src/openvpnmsica/openvpnmsica.c index 31e90bd2..f203f736 100644 --- a/src/openvpnmsica/openvpnmsica.c +++ b/src/openvpnmsica/openvpnmsica.c @@ -1096,12 +1096,9 @@ ProcessDeferredAction(_In_ MSIHANDLE hInstall) dwResult = tap_create_adapter(NULL, NULL, szHardwareId, &bRebootRequired, &guidAdapter); if (dwResult == ERROR_SUCCESS) { - /* Set adapter name. */ - dwResult = tap_set_adapter_name(&guidAdapter, szName); - if (dwResult != ERROR_SUCCESS) - { - tap_delete_adapter(NULL, &guidAdapter, &bRebootRequired); - } + /* Set adapter name. May fail on some machines, but that is not critical - use silent + flag to mute messagebox and print error only to log */ + tap_set_adapter_name(&guidAdapter, szName, TRUE); } } else if (wcsncmp(szArg[i], L"deleteN=", 8) == 0) diff --git a/src/tapctl/main.c b/src/tapctl/main.c index 31bb2ec7..d5bc7290 100644 --- a/src/tapctl/main.c +++ b/src/tapctl/main.c @@ -237,7 +237,7 @@ _tmain(int argc, LPCTSTR argv[]) } /* Rename the adapter. */ - dwResult = tap_set_adapter_name(&guidAdapter, szName); + dwResult = tap_set_adapter_name(&guidAdapter, szName, FALSE); if (dwResult != ERROR_SUCCESS) { StringFromIID((REFIID)&guidAdapter, &szAdapterId); diff --git a/src/tapctl/tap.c b/src/tapctl/tap.c index 7cb3dedc..0dfe239f 100644 --- a/src/tapctl/tap.c +++ b/src/tapctl/tap.c @@ -1140,9 +1140,12 @@ ExecCommand(const WCHAR* cmdline) DWORD tap_set_adapter_name( _In_ LPCGUID pguidAdapter, - _In_ LPCTSTR szName) + _In_ LPCTSTR szName, + _In_ BOOL bSilent) { DWORD dwResult; + int msg_flag = bSilent ? M_WARN : M_NONFATAL; + msg_flag |= M_ERRNO; if (pguidAdapter == NULL || szName == NULL) { @@ -1176,7 +1179,7 @@ tap_set_adapter_name( if (dwResult != ERROR_SUCCESS) { SetLastError(dwResult); /* MSDN does not mention RegOpenKeyEx() to set GetLastError(). But we do have an error code. Set last error manually. */ - msg(M_NONFATAL | M_ERRNO, "%s: RegOpenKeyEx(HKLM, \"%" PRIsLPTSTR "\") failed", __FUNCTION__, szRegKey); + msg(msg_flag, "%s: RegOpenKeyEx(HKLM, \"%" PRIsLPTSTR "\") failed", __FUNCTION__, szRegKey); goto cleanup_szAdapterId; } @@ -1185,7 +1188,7 @@ tap_set_adapter_name( if (dwResult != ERROR_SUCCESS) { SetLastError(dwResult); - msg(M_NONFATAL | M_ERRNO, "%s: Error reading adapter name", __FUNCTION__); + msg(msg_flag, "%s: Error reading adapter name", __FUNCTION__); goto cleanup_hKey; } @@ -1203,7 +1206,7 @@ tap_set_adapter_name( if (dwResult != ERROR_SUCCESS) { SetLastError(dwResult); - msg(M_NONFATAL | M_ERRNO, "%s: Error renaming adapter", __FUNCTION__); + msg(msg_flag, "%s: Error renaming adapter", __FUNCTION__); goto cleanup_hKey; } diff --git a/src/tapctl/tap.h b/src/tapctl/tap.h index 102de32d..1f531cf2 100644 --- a/src/tapctl/tap.h +++ b/src/tapctl/tap.h @@ -117,13 +117,17 @@ tap_enable_adapter( * @param pguidAdapter A pointer to GUID that contains network adapter ID. * * @param szName New adapter name - must be unique + * + * @param bSilent If true, MSI installer won't display message box and + * only print error to log. * * @return ERROR_SUCCESS on success; Win32 error code otherwise **/ DWORD tap_set_adapter_name( _In_ LPCGUID pguidAdapter, - _In_ LPCTSTR szName); + _In_ LPCTSTR szName, + _In_ BOOL bSilent); /**