From patchwork Mon Mar 9 02:17:24 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Rozman X-Patchwork-Id: 1024 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director12.mail.ord1d.rsapps.net ([172.30.191.6]) by backend30.mail.ord1d.rsapps.net with LMTP id MJDCE1JCZl6tHAAAIUCqbw for ; Mon, 09 Mar 2020 09:19:14 -0400 Received: from proxy8.mail.ord1d.rsapps.net ([172.30.191.6]) by director12.mail.ord1d.rsapps.net with LMTP id UHuUE1JCZl7HUAAAIasKDg ; Mon, 09 Mar 2020 09:19:14 -0400 Received: from smtp7.gate.ord1d ([172.30.191.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy8.mail.ord1d.rsapps.net with LMTP id uPDQElJCZl5TQQAAGdz6CA ; Mon, 09 Mar 2020 09:19:14 -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: smtp7.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; dkim=fail (signature verification failed) header.d=rozman.si; dmarc=fail (p=none; dis=none) header.from=rozman.si X-Suspicious-Flag: YES X-Classification-ID: 91a8bd3e-6208-11ea-81be-525400d0c497-1-1 Received: from [216.105.38.7] ([216.105.38.7:46194] helo=lists.sourceforge.net) by smtp7.gate.ord1d.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id 1C/F1-11674-152466E5; Mon, 09 Mar 2020 09:19:13 -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 1jBIIj-0005wt-Ba; Mon, 09 Mar 2020 13:18:33 +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 1jBIIg-0005wK-Bg for openvpn-devel@lists.sourceforge.net; Mon, 09 Mar 2020 13:18:30 +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=CpwbTGZK9FtSSF4q6ca1+RxN0MS8IQl3jGQYu/k3cp4=; b=Y/otBFulDeWq3D9JelAjdI76/N e1+HUyvNrzSpuyPyN4CzJCixo0/QS1AfMvj+UBhDdiRAOpYkHi4KjZ9ecfFVrjK+ISZkQ84GjDtFW /pMQ4wLgLjobW6cGz//74OGml7V/RE2yzF5HZrQ8SFEQo2U8hQqJH3vSefT0maC4ffhM=; 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=CpwbTGZK9FtSSF4q6ca1+RxN0MS8IQl3jGQYu/k3cp4=; b=Aox7wL9khvES3eX41Vy370WQ79 5CFwe9LhJxX1Y3AQxpGYur3bF8OqZT1csQBsCQdEs/+hyA98Q1jFj6O/GyxQ9YYNe5+hq52X1IQse 8vw2KKPiLr6iSeXPg2jOtHnK0HT0kgIzZaIH5mfqBZVBA58ZflpxEWb12034KmCR1BgQ=; Received: from pub5.amebis.si ([213.250.55.21]) by sfi-mx-4.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.92.2) id 1jBIIc-006jrl-QI for openvpn-devel@lists.sourceforge.net; Mon, 09 Mar 2020 13:18:30 +0000 Received: by pub5.amebis.si (Postfix, from userid 1000) id CCAD01002B60; Mon, 9 Mar 2020 14:18:00 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rozman.si; s=default; t=1583759880; bh=CpwbTGZK9FtSSF4q6ca1+RxN0MS8IQl3jGQYu/k3cp4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hTgx3uyC5X4xC8XvBkhK+EexF1zlkzPjH2ZfV4HDhbqGd4aHs2XPSXG47BIANo6o+ dBiUmhs2oObGyq1/zps2tXz8zAHgXLqgnDcArjnID/G72MDAYo2IFrW+Bb7UumAIc0 WTR9nKczG8DSenSYyqGHtgJwUOOuINQLt8sV2HeA= X-Spam-Checker-Version: SpamAssassin 3.4.3 (2019-12-06) on brana.amebis.doma X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=ALL_TRUSTED,BAYES_00, WEIRD_QUOTING autolearn=ham autolearn_force=no version=3.4.3 Received: from SR6.amebis.doma (unknown [IPv6:2a00:ee2:209:164:a5ae:e83c:b7b:725]) by pub5.amebis.si (Postfix) with ESMTP id 7EE1F1002FC7; Mon, 9 Mar 2020 14:17:49 +0100 (CET) From: Simon Rozman To: openvpn-devel@lists.sourceforge.net Date: Mon, 9 Mar 2020 14:17:24 +0100 Message-Id: <20200309131728.380-8-simon@rozman.si> X-Mailer: git-send-email 2.24.1.windows.2 In-Reply-To: <20200309131728.380-1-simon@rozman.si> References: <20200309131728.380-1-simon@rozman.si> MIME-Version: 1.0 X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. See http://spamassassin.org/tag/ for more details. -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 WEIRD_QUOTING BODY: Weird repeated double-quotation marks -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 AWL AWL: Adjusted score from AWL reputation of From: address X-Headers-End: 1jBIIc-006jrl-QI Subject: [Openvpn-devel] [PATCH 08/12] openvpnmsica: "TAP" => "TUN/TAP" 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 The function and property names that are common to TAP and TUN from TAP-Windows6 and TUN from Wintun were renamed not to make the now mainstream TUN sad. I would have go with just the "adapter". But, wouldn't that cause confusion when user sees "Deleting adapters" when uninstalling the OpenVPN? Internal variable names were simplified thou to omit the TUN/TAP referencing. Signed-off-by: Simon Rozman Acked-by: Lev Stipakov --- src/openvpnmsica/openvpnmsica.c | 156 ++++++++++++++++---------------- src/openvpnmsica/openvpnmsica.h | 8 +- 2 files changed, 82 insertions(+), 82 deletions(-) diff --git a/src/openvpnmsica/openvpnmsica.c b/src/openvpnmsica/openvpnmsica.c index 1438d3f7..4223b680 100644 --- a/src/openvpnmsica/openvpnmsica.c +++ b/src/openvpnmsica/openvpnmsica.c @@ -272,7 +272,7 @@ FindSystemInfo(_In_ MSIHANDLE hInstall) UINT __stdcall -FindTAPAdapters(_In_ MSIHANDLE hInstall) +FindTUNTAPAdapters(_In_ MSIHANDLE hInstall) { #ifdef _MSC_VER #pragma comment(linker, DLLEXP_EXPORT) @@ -337,21 +337,21 @@ FindTAPAdapters(_In_ MSIHANDLE hInstall) /* Prepare semicolon delimited list of TAP adapter ID(s) and active TAP adapter ID(s). */ LPTSTR - szTAPAdapters = (LPTSTR)malloc(adapter_count * (38 /*GUID*/ + 1 /*separator/terminator*/) * sizeof(TCHAR)), - szTAPAdaptersTail = szTAPAdapters; - if (szTAPAdapters == NULL) + szAdapters = (LPTSTR)malloc(adapter_count * (38 /*GUID*/ + 1 /*separator/terminator*/) * sizeof(TCHAR)), + szAdaptersTail = szAdapters; + if (szAdapters == NULL) { msg(M_FATAL, "%s: malloc(%u) failed", __FUNCTION__, adapter_count * (38 /*GUID*/ + 1 /*separator/terminator*/) * sizeof(TCHAR)); uiResult = ERROR_OUTOFMEMORY; goto cleanup_pAdapterAdresses; } LPTSTR - szTAPAdaptersActive = (LPTSTR)malloc(adapter_count * (38 /*GUID*/ + 1 /*separator/terminator*/) * sizeof(TCHAR)), - szTAPAdaptersActiveTail = szTAPAdaptersActive; - if (szTAPAdaptersActive == NULL) + szAdaptersActive = (LPTSTR)malloc(adapter_count * (38 /*GUID*/ + 1 /*separator/terminator*/) * sizeof(TCHAR)), + szAdaptersActiveTail = szAdaptersActive; + if (szAdaptersActive == NULL) { msg(M_FATAL, "%s: malloc(%u) failed", __FUNCTION__, adapter_count * (38 /*GUID*/ + 1 /*separator/terminator*/) * sizeof(TCHAR)); - uiResult = ERROR_OUTOFMEMORY; goto cleanup_szTAPAdapters; + uiResult = ERROR_OUTOFMEMORY; goto cleanup_szAdapters; } for (struct tap_adapter_node *pAdapter = pAdapterList; pAdapter; pAdapter = pAdapter->pNext) @@ -361,12 +361,12 @@ FindTAPAdapters(_In_ MSIHANDLE hInstall) StringFromIID((REFIID)&pAdapter->guid, &szAdapterId); /* Append to the list of TAP adapter ID(s). */ - if (szTAPAdapters < szTAPAdaptersTail) + if (szAdapters < szAdaptersTail) { - *(szTAPAdaptersTail++) = TEXT(';'); + *(szAdaptersTail++) = TEXT(';'); } - memcpy(szTAPAdaptersTail, szAdapterId, 38 * sizeof(TCHAR)); - szTAPAdaptersTail += 38; + memcpy(szAdaptersTail, szAdapterId, 38 * sizeof(TCHAR)); + szAdaptersTail += 38; /* If this adapter is active (connected), add it to the list of active TAP adapter ID(s). */ for (PIP_ADAPTER_ADDRESSES p = pAdapterAdresses; p; p = p->Next) @@ -380,43 +380,43 @@ FindTAPAdapters(_In_ MSIHANDLE hInstall) if (p->OperStatus == IfOperStatusUp) { /* This TAP adapter is active (connected). */ - if (szTAPAdaptersActive < szTAPAdaptersActiveTail) + if (szAdaptersActive < szAdaptersActiveTail) { - *(szTAPAdaptersActiveTail++) = TEXT(';'); + *(szAdaptersActiveTail++) = TEXT(';'); } - memcpy(szTAPAdaptersActiveTail, szAdapterId, 38 * sizeof(TCHAR)); - szTAPAdaptersActiveTail += 38; + memcpy(szAdaptersActiveTail, szAdapterId, 38 * sizeof(TCHAR)); + szAdaptersActiveTail += 38; } break; } } CoTaskMemFree(szAdapterId); } - szTAPAdaptersTail [0] = 0; - szTAPAdaptersActiveTail[0] = 0; + szAdaptersTail [0] = 0; + szAdaptersActiveTail[0] = 0; - /* Set Installer TAPADAPTERS property. */ - uiResult = MsiSetProperty(hInstall, TEXT("TAPADAPTERS"), szTAPAdapters); + /* Set Installer TUNTAPADAPTERS property. */ + uiResult = MsiSetProperty(hInstall, TEXT("TUNTAPADAPTERS"), szAdapters); if (uiResult != ERROR_SUCCESS) { SetLastError(uiResult); /* MSDN does not mention MsiSetProperty() to set GetLastError(). But we do have an error code. Set last error manually. */ - msg(M_NONFATAL | M_ERRNO, "%s: MsiSetProperty(\"TAPADAPTERS\") failed", __FUNCTION__); - goto cleanup_szTAPAdaptersActive; + msg(M_NONFATAL | M_ERRNO, "%s: MsiSetProperty(\"TUNTAPADAPTERS\") failed", __FUNCTION__); + goto cleanup_szAdaptersActive; } - /* Set Installer ACTIVETAPADAPTERS property. */ - uiResult = MsiSetProperty(hInstall, TEXT("ACTIVETAPADAPTERS"), szTAPAdaptersActive); + /* Set Installer ACTIVETUNTAPADAPTERS property. */ + uiResult = MsiSetProperty(hInstall, TEXT("ACTIVETUNTAPADAPTERS"), szAdaptersActive); if (uiResult != ERROR_SUCCESS) { SetLastError(uiResult); /* MSDN does not mention MsiSetProperty() to set GetLastError(). But we do have an error code. Set last error manually. */ - msg(M_NONFATAL | M_ERRNO, "%s: MsiSetProperty(\"ACTIVETAPADAPTERS\") failed", __FUNCTION__); - goto cleanup_szTAPAdaptersActive; + msg(M_NONFATAL | M_ERRNO, "%s: MsiSetProperty(\"ACTIVETUNTAPADAPTERS\") failed", __FUNCTION__); + goto cleanup_szAdaptersActive; } -cleanup_szTAPAdaptersActive: - free(szTAPAdaptersActive); -cleanup_szTAPAdapters: - free(szTAPAdapters); +cleanup_szAdaptersActive: + free(szAdaptersActive); +cleanup_szAdapters: + free(szAdapters); } else { @@ -550,15 +550,15 @@ cleanup_CoInitialize: * * When the rollback is enabled, the adapter deletition is scheduled on rollback. * - * @param seq The argument sequence to pass to InstallTAPAdapters custom action + * @param seq The argument sequence to pass to InstallTUNTAPAdapters custom action * - * @param seqRollback The argument sequence to pass to InstallTAPAdaptersRollback custom + * @param seqRollback The argument sequence to pass to InstallTUNTAPAdaptersRollback custom * action. NULL when rollback is disabled. * * @param szDisplayName Adapter display name. * * @param iTicks Pointer to an integer that represents amount of work (on progress - * indicator) the InstallTAPAdapters will take. This function increments it + * indicator) the InstallTUNTAPAdapters will take. This function increments it * by MSICA_ADAPTER_TICK_SIZE for each adapter to create. * * @return ERROR_SUCCESS on success; An error code otherwise @@ -586,7 +586,7 @@ schedule_adapter_create( /* No adapter with a same name found. */ TCHAR szArgument[10 /*create=""|deleteN=""*/ + MAX_PATH /*szDisplayName*/ + 1 /*terminator*/]; - /* InstallTAPAdapters will create the adapter. */ + /* InstallTUNTAPAdapters will create the adapter. */ _stprintf_s( szArgument, _countof(szArgument), TEXT("create=\"%.*s\""), @@ -595,7 +595,7 @@ schedule_adapter_create( if (seqRollback) { - /* InstallTAPAdaptersRollback will delete the adapter. */ + /* InstallTUNTAPAdaptersRollback will delete the adapter. */ _stprintf_s( szArgument, _countof(szArgument), TEXT("deleteN=\"%.*s\""), @@ -640,23 +640,23 @@ cleanup_pAdapterList: * Schedules adapter deletion. * * When the rollback is enabled, the adapter deletition is scheduled as: disable in - * UninstallTAPAdapters, enable on rollback, delete on commit. + * UninstallTUNTAPAdapters, enable on rollback, delete on commit. * * When rollback is disabled, the adapter deletition is scheduled as delete in - * UninstallTAPAdapters. + * UninstallTUNTAPAdapters. * - * @param seq The argument sequence to pass to UninstallTAPAdapters custom action + * @param seq The argument sequence to pass to UninstallTUNTAPAdapters custom action * - * @param seqCommit The argument sequence to pass to UninstallTAPAdaptersCommit custom + * @param seqCommit The argument sequence to pass to UninstallTUNTAPAdaptersCommit custom * action. NULL when rollback is disabled. * - * @param seqRollback The argument sequence to pass to UninstallTAPAdaptersRollback custom + * @param seqRollback The argument sequence to pass to UninstallTUNTAPAdaptersRollback custom * action. NULL when rollback is disabled. * * @param szDisplayName Adapter display name. * * @param iTicks Pointer to an integer that represents amount of work (on progress - * indicator) the UninstallTAPAdapters will take. This function increments + * indicator) the UninstallTUNTAPAdapters will take. This function increments * it by MSICA_ADAPTER_TICK_SIZE for each adapter to delete. * * @return ERROR_SUCCESS on success; An error code otherwise @@ -686,21 +686,21 @@ schedule_adapter_delete( TCHAR szArgument[8 /*disable=|enable=|delete=*/ + 38 /*{xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx}*/ + 1 /*terminator*/]; if (seqCommit && seqRollback) { - /* UninstallTAPAdapters will disable the adapter. */ + /* UninstallTUNTAPAdapters will disable the adapter. */ _stprintf_s( szArgument, _countof(szArgument), TEXT("disable=") TEXT(PRIXGUID), PRIGUID_PARAM(pAdapter->guid)); msica_arg_seq_add_tail(seq, szArgument); - /* UninstallTAPAdaptersRollback will re-enable the adapter. */ + /* UninstallTUNTAPAdaptersRollback will re-enable the adapter. */ _stprintf_s( szArgument, _countof(szArgument), TEXT("enable=") TEXT(PRIXGUID), PRIGUID_PARAM(pAdapter->guid)); msica_arg_seq_add_head(seqRollback, szArgument); - /* UninstallTAPAdaptersCommit will delete the adapter. */ + /* UninstallTUNTAPAdaptersCommit will delete the adapter. */ _stprintf_s( szArgument, _countof(szArgument), TEXT("delete=") TEXT(PRIXGUID), @@ -709,7 +709,7 @@ schedule_adapter_delete( } else { - /* UninstallTAPAdapters will delete the adapter. */ + /* UninstallTUNTAPAdapters will delete the adapter. */ _stprintf_s( szArgument, _countof(szArgument), TEXT("delete=") TEXT(PRIXGUID), @@ -728,7 +728,7 @@ schedule_adapter_delete( UINT __stdcall -EvaluateTAPAdapters(_In_ MSIHANDLE hInstall) +EvaluateTUNTAPAdapters(_In_ MSIHANDLE hInstall) { #ifdef _MSC_VER #pragma comment(linker, DLLEXP_EXPORT) @@ -742,18 +742,18 @@ EvaluateTAPAdapters(_In_ MSIHANDLE hInstall) OPENVPNMSICA_SAVE_MSI_SESSION(hInstall); struct msica_arg_seq - seqInstallTAPAdapters, - seqInstallTAPAdaptersCommit, - seqInstallTAPAdaptersRollback, - seqUninstallTAPAdapters, - seqUninstallTAPAdaptersCommit, - seqUninstallTAPAdaptersRollback; - msica_arg_seq_init(&seqInstallTAPAdapters); - msica_arg_seq_init(&seqInstallTAPAdaptersCommit); - msica_arg_seq_init(&seqInstallTAPAdaptersRollback); - msica_arg_seq_init(&seqUninstallTAPAdapters); - msica_arg_seq_init(&seqUninstallTAPAdaptersCommit); - msica_arg_seq_init(&seqUninstallTAPAdaptersRollback); + seqInstall, + seqInstallCommit, + seqInstallRollback, + seqUninstall, + seqUninstallCommit, + seqUninstallRollback; + msica_arg_seq_init(&seqInstall); + msica_arg_seq_init(&seqInstallCommit); + msica_arg_seq_init(&seqInstallRollback); + msica_arg_seq_init(&seqUninstall); + msica_arg_seq_init(&seqUninstallCommit); + msica_arg_seq_init(&seqUninstallRollback); /* Check rollback state. */ bool bRollbackEnabled = MsiEvaluateCondition(hInstall, TEXT("RollbackDisabled")) != MSICONDITION_TRUE; @@ -767,8 +767,8 @@ EvaluateTAPAdapters(_In_ MSIHANDLE hInstall) goto cleanup_exec_seq; } - /* Check if TAPAdapter table exists. If it doesn't exist, there's nothing to do. */ - switch (MsiDatabaseIsTablePersistent(hDatabase, TEXT("TAPAdapter"))) + /* Check if TUNTAPAdapter table exists. If it doesn't exist, there's nothing to do. */ + switch (MsiDatabaseIsTablePersistent(hDatabase, TEXT("TUNTAPAdapter"))) { case MSICONDITION_FALSE: case MSICONDITION_TRUE: break; @@ -780,7 +780,7 @@ EvaluateTAPAdapters(_In_ MSIHANDLE hInstall) /* Prepare a query to get a list/view of adapters. */ MSIHANDLE hViewST = 0; - LPCTSTR szQuery = TEXT("SELECT `Adapter`,`DisplayName`,`Condition`,`Component_` FROM `TAPAdapter`"); + LPCTSTR szQuery = TEXT("SELECT `Adapter`,`DisplayName`,`Condition`,`Component_` FROM `TUNTAPAdapter`"); uiResult = MsiDatabaseOpenView(hDatabase, szQuery, &hViewST); if (uiResult != ERROR_SUCCESS) { @@ -897,8 +897,8 @@ EvaluateTAPAdapters(_In_ MSIHANDLE hInstall) /* Component is or should be installed. Schedule adapter creation. */ if (schedule_adapter_create( - &seqInstallTAPAdapters, - bRollbackEnabled ? &seqInstallTAPAdaptersRollback : NULL, + &seqInstall, + bRollbackEnabled ? &seqInstallRollback : NULL, szDisplayNameEx, &iTicks) != ERROR_SUCCESS) { @@ -914,9 +914,9 @@ EvaluateTAPAdapters(_In_ MSIHANDLE hInstall) * Better a partial uninstallation than no uninstallation at all. */ schedule_adapter_delete( - &seqUninstallTAPAdapters, - bRollbackEnabled ? &seqUninstallTAPAdaptersCommit : NULL, - bRollbackEnabled ? &seqUninstallTAPAdaptersRollback : NULL, + &seqUninstall, + bRollbackEnabled ? &seqUninstallCommit : NULL, + bRollbackEnabled ? &seqUninstallRollback : NULL, szDisplayNameEx, &iTicks); } @@ -943,12 +943,12 @@ cleanup_hRecord: } /* Store deferred custom action parameters. */ - if ((uiResult = setup_sequence(hInstall, TEXT("InstallTAPAdapters" ), &seqInstallTAPAdapters )) != ERROR_SUCCESS - || (uiResult = setup_sequence(hInstall, TEXT("InstallTAPAdaptersCommit" ), &seqInstallTAPAdaptersCommit )) != ERROR_SUCCESS - || (uiResult = setup_sequence(hInstall, TEXT("InstallTAPAdaptersRollback" ), &seqInstallTAPAdaptersRollback )) != ERROR_SUCCESS - || (uiResult = setup_sequence(hInstall, TEXT("UninstallTAPAdapters" ), &seqUninstallTAPAdapters )) != ERROR_SUCCESS - || (uiResult = setup_sequence(hInstall, TEXT("UninstallTAPAdaptersCommit" ), &seqUninstallTAPAdaptersCommit )) != ERROR_SUCCESS - || (uiResult = setup_sequence(hInstall, TEXT("UninstallTAPAdaptersRollback"), &seqUninstallTAPAdaptersRollback)) != ERROR_SUCCESS) + if ((uiResult = setup_sequence(hInstall, TEXT("InstallTUNTAPAdapters" ), &seqInstall )) != ERROR_SUCCESS + || (uiResult = setup_sequence(hInstall, TEXT("InstallTUNTAPAdaptersCommit" ), &seqInstallCommit )) != ERROR_SUCCESS + || (uiResult = setup_sequence(hInstall, TEXT("InstallTUNTAPAdaptersRollback" ), &seqInstallRollback )) != ERROR_SUCCESS + || (uiResult = setup_sequence(hInstall, TEXT("UninstallTUNTAPAdapters" ), &seqUninstall )) != ERROR_SUCCESS + || (uiResult = setup_sequence(hInstall, TEXT("UninstallTUNTAPAdaptersCommit" ), &seqUninstallCommit )) != ERROR_SUCCESS + || (uiResult = setup_sequence(hInstall, TEXT("UninstallTUNTAPAdaptersRollback"), &seqUninstallRollback)) != ERROR_SUCCESS) { goto cleanup_hRecordProg; } @@ -964,12 +964,12 @@ cleanup_hViewST: cleanup_hDatabase: MsiCloseHandle(hDatabase); cleanup_exec_seq: - msica_arg_seq_free(&seqInstallTAPAdapters); - msica_arg_seq_free(&seqInstallTAPAdaptersCommit); - msica_arg_seq_free(&seqInstallTAPAdaptersRollback); - msica_arg_seq_free(&seqUninstallTAPAdapters); - msica_arg_seq_free(&seqUninstallTAPAdaptersCommit); - msica_arg_seq_free(&seqUninstallTAPAdaptersRollback); + msica_arg_seq_free(&seqInstall); + msica_arg_seq_free(&seqInstallCommit); + msica_arg_seq_free(&seqInstallRollback); + msica_arg_seq_free(&seqUninstall); + msica_arg_seq_free(&seqUninstallCommit); + msica_arg_seq_free(&seqUninstallRollback); if (bIsCoInitialized) { CoUninitialize(); diff --git a/src/openvpnmsica/openvpnmsica.h b/src/openvpnmsica/openvpnmsica.h index 14fb78a2..5d140930 100644 --- a/src/openvpnmsica/openvpnmsica.h +++ b/src/openvpnmsica/openvpnmsica.h @@ -90,7 +90,7 @@ FindSystemInfo(_In_ MSIHANDLE hInstall); /** - * Find existing TAP adapters and set TAPADAPTERS and ACTIVETAPADAPTERS properties with + * Find existing TAP adapters and set TUNTAPADAPTERS and ACTIVETUNTAPADAPTERS properties with * semicolon delimited list of all installed TAP adapter GUIDs and active adapter GUIDs * respectively. * @@ -100,7 +100,7 @@ FindSystemInfo(_In_ MSIHANDLE hInstall); * See: https://msdn.microsoft.com/en-us/library/windows/desktop/aa368072.aspx */ DLLEXP_DECL UINT __stdcall -FindTAPAdapters(_In_ MSIHANDLE hInstall); +FindTUNTAPAdapters(_In_ MSIHANDLE hInstall); /** @@ -129,7 +129,7 @@ StartOpenVPNGUI(_In_ MSIHANDLE hInstall); /** - * Evaluate the TAPAdapter table of the MSI package database and prepare a list of TAP + * Evaluate the TUNTAPAdapter table of the MSI package database and prepare a list of TAP * adapters to install/remove. * * @param hInstall Handle to the installation provided to the DLL custom action @@ -138,7 +138,7 @@ StartOpenVPNGUI(_In_ MSIHANDLE hInstall); * See: https://msdn.microsoft.com/en-us/library/windows/desktop/aa368072.aspx */ DLLEXP_DECL UINT __stdcall -EvaluateTAPAdapters(_In_ MSIHANDLE hInstall); +EvaluateTUNTAPAdapters(_In_ MSIHANDLE hInstall); /**