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
---
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)
{
