AZEN-SGG/amnezia-client
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

custom sitet pre release

Browse source
This commit is contained in:
pokamest 2021-06-01 18:18:09 +03:00
parent 34b97bdc24
commit 9dbe15a0e3
156 changed files with 5404 additions and 326 deletions
Download patch file Download diff file Expand all files Collapse all files

15
service/server/router.cpp
View file

@ -7,15 +7,6 @@
#endif
bool Router::routeAdd(const QString &ip, const QString &gw)
{
#ifdef Q_OS_WIN
return RouterWin::Instance().routeAdd(ip, gw);
#elif defined (Q_OS_MAC)
return RouterMac::Instance().routeAdd(ip, gw);
#endif
}
int Router::routeAddList(const QString &gw, const QStringList &ips)
{
#ifdef Q_OS_WIN
@ -34,12 +25,12 @@ bool Router::clearSavedRoutes()
#endif
}
bool Router::routeDelete(const QString &ip, const QString &gw)
int Router::routeDeleteList(const QString &gw, const QStringList &ips)
{
#ifdef Q_OS_WIN
return RouterWin::Instance().routeDelete(ip, gw);
return RouterWin::Instance().routeDeleteList(gw, ips);
#elif defined (Q_OS_MAC)
return RouterMac::Instance().routeDelete(ip, gw);
return RouterMac::Instance().routeDeleteList(gw, ips);
#endif
}

3
service/server/router.h
View file

@ -15,10 +15,9 @@ class Router : public QObject
{
Q_OBJECT
public:
static bool routeAdd(const QString &ip, const QString &gw);
static int routeAddList(const QString &gw, const QStringList &ips);
static bool clearSavedRoutes();
static bool routeDelete(const QString &ip, const QString &gw);
static int routeDeleteList(const QString &gw, const QStringList &ips);
static void flushDns();
};

4
service/server/router_mac.cpp
View file

@ -13,8 +13,6 @@ RouterMac &RouterMac::Instance()
bool RouterMac::routeAdd(const QString &ipWithSubnet, const QString &gw)
{
QString ip = Utils::ipAddressFromIpWithSubnet(ipWithSubnet);
QString mask = Utils::netMaskFromIpWithSubnet(ipWithSubnet);
@ -67,7 +65,7 @@ bool RouterMac::clearSavedRoutes()
// return (cnt == m_addedRoutes.count());
}
bool RouterMac::routeDelete(const QString &ip, const QString &gw)
bool RouterMac::routeDeleteList(const QString &gw, const QStringList &ips)
{
if (ip == "0.0.0.0") {
qDebug().noquote() << "Warning, trying to remove default route, skipping: " << ip << gw;

2
service/server/router_mac.h
View file

@ -21,7 +21,7 @@ public:
bool routeAdd(const QString &ip, const QString &gw);
int routeAddList(const QString &gw, const QStringList &ips);
bool clearSavedRoutes();
bool routeDelete(const QString &ip, const QString &gw);
bool routeDeleteList(const QString &gw, const QStringList &ips);
void flushDns();
public slots:

369
service/server/router_win.cpp
View file

@ -1,104 +1,30 @@
#include "router_win.h"
#include "../client/utils.h"
#include <string>
#include <tlhelp32.h>
#include <tchar.h>
#include <QProcess>
LONG (NTAPI * NtSuspendProcess)(HANDLE ProcessHandle) = NULL;
LONG (NTAPI * NtResumeProcess)(HANDLE ProcessHandle) = NULL;
#define STATUS_SUCCESS ((NTSTATUS)0x00000000L)
RouterWin &RouterWin::Instance()
{
static RouterWin s;
BOOL ok;
ok = s.InitNtFunctions();
if (!ok) qDebug() << "RouterWin::Instance failed to InitNtFunctions";
ok = s.EnableDebugPrivilege();
if (!ok) qDebug() << "RouterWin::Instance failed to EnableDebugPrivilege";
return s;
}
bool RouterWin::routeAdd(const QString &ip, const QString &gw)
{
//qDebug().noquote() << QString("ROUTE ADD: IP:%1 GW %2").arg(ip).arg(gw);
QString mask = Utils::netMaskFromIpWithSubnet(ip);
PMIB_IPFORWARDTABLE pIpForwardTable = NULL;
MIB_IPFORWARDROW ipfrow;
DWORD dwSize = 0;
BOOL bOrder = FALSE;
DWORD dwStatus = 0;
// Find out how big our buffer needs to be.
dwStatus = GetIpForwardTable(pIpForwardTable, &dwSize, bOrder);
if (dwStatus == ERROR_INSUFFICIENT_BUFFER) {
// Allocate the memory for the table
if (!(pIpForwardTable = (PMIB_IPFORWARDTABLE) malloc(dwSize))) {
qDebug() << "Malloc failed. Out of memory.";
return false;
}
// Now get the table.
dwStatus = GetIpForwardTable(pIpForwardTable, &dwSize, bOrder);
}
if (dwStatus != ERROR_SUCCESS) {
qDebug() << "getIpForwardTable failed.";
if (pIpForwardTable)
free(pIpForwardTable);
return false;
}
// Set iface for route
IPAddr dwGwAddr = inet_addr(gw.toStdString().c_str());
if (GetBestInterface(dwGwAddr, &ipfrow.dwForwardIfIndex) != NO_ERROR) {
qDebug() << "Router::routeAdd : GetBestInterface failed";
return false;
}
// address
ipfrow.dwForwardDest = inet_addr(Utils::ipAddressFromIpWithSubnet(ip).toStdString().c_str());
// mask
in_addr maskAddr;
inet_pton(AF_INET, mask.toStdString().c_str(), &maskAddr);
ipfrow.dwForwardMask = maskAddr.S_un.S_addr;
// Get TAP iface metric to set it for new routes
MIB_IPINTERFACE_ROW tap_iface;
InitializeIpInterfaceEntry(&tap_iface);
tap_iface.InterfaceIndex = ipfrow.dwForwardIfIndex;
tap_iface.Family = AF_INET;
dwStatus = GetIpInterfaceEntry(&tap_iface);
if (dwStatus == NO_ERROR){
ipfrow.dwForwardMetric1 = tap_iface.Metric;
}
else {
qDebug() << "Router::routeAdd: failed GetIpInterfaceEntry(), Error:" << dwStatus;
ipfrow.dwForwardMetric1 = 256;
}
ipfrow.dwForwardMetric2 = 0;
ipfrow.dwForwardMetric3 = 0;
ipfrow.dwForwardMetric4 = 0;
ipfrow.dwForwardMetric5 = 0;
ipfrow.dwForwardAge = 0;
ipfrow.dwForwardNextHop = inet_addr(gw.toStdString().c_str());
ipfrow.dwForwardType = 4; /* XXX - next hop != final dest */
ipfrow.dwForwardProto = 3; /* XXX - MIB_PROTO_NETMGMT */
dwStatus = CreateIpForwardEntry(&ipfrow);
if (dwStatus == NO_ERROR){
ipForwardRows.append(ipfrow);
//qDebug() << "Gateway changed successfully";
}
else {
qDebug() << "Router::routeAdd: failed CreateIpForwardEntry()";
qDebug() << "Error: " << dwStatus;
}
// Free resources
if (pIpForwardTable)
free(pIpForwardTable);
return (dwStatus == NO_ERROR);
}
int RouterWin::routeAddList(const QString &gw, const QStringList &ips)
{
// qDebug().noquote() << QString("ROUTE ADD List: IPs size:%1, GW: %2")
@ -109,7 +35,6 @@ int RouterWin::routeAddList(const QString &gw, const QStringList &ips)
// .arg(ips.join("\n"));
PMIB_IPFORWARDTABLE pIpForwardTable = NULL;
DWORD dwSize = 0;
BOOL bOrder = FALSE;
@ -138,22 +63,18 @@ int RouterWin::routeAddList(const QString &gw, const QStringList &ips)
int success_count = 0;
QString mask;
MIB_IPFORWARDROW ipfrow;
ipfrow.dwForwardPolicy = 0;
ipfrow.dwForwardAge = 0;
ipfrow.dwForwardAge = INFINITE;
ipfrow.dwForwardNextHop = inet_addr(gw.toStdString().c_str());
ipfrow.dwForwardType = 4; /* XXX - next hop != final dest */
ipfrow.dwForwardProto = 3; /* XXX - MIB_PROTO_NETMGMT */
ipfrow.dwForwardType = MIB_IPROUTE_TYPE_INDIRECT; /* XXX - next hop != final dest */
ipfrow.dwForwardProto = MIB_IPPROTO_NETMGMT; /* XXX - MIB_PROTO_NETMGMT */
// Set iface for route
IPAddr dwGwAddr = inet_addr(gw.toStdString().c_str());
IPAddr dwGwAddr = inet_addr(gw.toStdString().c_str());
if (GetBestInterface(dwGwAddr, &ipfrow.dwForwardIfIndex) != NO_ERROR) {
qDebug() << "Router::routeAddList : GetBestInterface failed";
return false;
@ -166,7 +87,7 @@ int RouterWin::routeAddList(const QString &gw, const QStringList &ips)
tap_iface.Family = AF_INET;
dwStatus = GetIpInterfaceEntry(&tap_iface);
if (dwStatus == NO_ERROR){
ipfrow.dwForwardMetric1 = tap_iface.Metric;
ipfrow.dwForwardMetric1 = tap_iface.Metric + 1;
}
else {
qDebug() << "Router::routeAddList: failed GetIpInterfaceEntry(), Error:" << dwStatus;
@ -190,16 +111,19 @@ int RouterWin::routeAddList(const QString &gw, const QStringList &ips)
inet_pton(AF_INET, mask.toStdString().c_str(), &maskAddr);
ipfrow.dwForwardMask = maskAddr.S_un.S_addr;
dwStatus = CreateIpForwardEntry(&ipfrow);
dwStatus = CreateIpForwardEntry(&ipfrow);
if (dwStatus == NO_ERROR){
ipForwardRows.append(ipfrow);
//qDebug() << "Gateway changed successfully";
m_ipForwardRows.insert(ip, ipfrow);
success_count++;
}
else if (dwStatus == ERROR_OBJECT_ALREADY_EXISTS) {
m_ipForwardRows.insert(ip, ipfrow);
success_count++;
qDebug() << "Router::routeAdd: warning, route already exist:" << ip << gw;
}
else {
qDebug() << "Router::routeAdd: failed CreateIpForwardEntry(), Error:" << ip << dwStatus;
qDebug() << "Router::routeAdd: failed CreateIpForwardEntry(), Error:" << ip << gw << dwStatus;
}
if (dwStatus == NO_ERROR) success_count++;
}
@ -208,14 +132,17 @@ int RouterWin::routeAddList(const QString &gw, const QStringList &ips)
free(pIpForwardTable);
qDebug() << "Router::routeAddList finished, success: " << success_count << "/" << ips.size();
if (m_ipForwardRows.size() > 500) suspendWcmSvc(true);
return success_count;
}
bool RouterWin::clearSavedRoutes()
{
if (ipForwardRows.isEmpty()) return true;
if (m_ipForwardRows.isEmpty()) return true;
qDebug() << "forward rows size:" << ipForwardRows.size();
qDebug() << "RouterWin::clearSavedRoutes forward rows size:" << m_ipForwardRows.size();
// Declare and initialize variables
PMIB_IPFORWARDTABLE pIpForwardTable = NULL;
@ -239,15 +166,16 @@ bool RouterWin::clearSavedRoutes()
qDebug() << "Router::clearSavedRoutes : getIpForwardTable failed";
if (pIpForwardTable)
free(pIpForwardTable);
return false;
}
int removed_count = 0;
for (int i = 0; i < ipForwardRows.size(); ++i) {
dwStatus = DeleteIpForwardEntry(&ipForwardRows[i]);
for (auto i = m_ipForwardRows.begin(); i != m_ipForwardRows.end(); ++i) {
dwStatus = DeleteIpForwardEntry(&i.value());
if (dwStatus != ERROR_SUCCESS) {
qDebug() << "Router::clearSavedRoutes : Could not delete old row" << i;
qDebug() << "Router::clearSavedRoutes : Could not delete old row" << i.key();
}
else removed_count++;
}
@ -255,25 +183,88 @@ bool RouterWin::clearSavedRoutes()
if (pIpForwardTable)
free(pIpForwardTable);
qDebug() << "Router::clearSavedRoutes : removed routes:" << removed_count << "of" << ipForwardRows.size();
ipForwardRows.clear();
qDebug() << "Router::clearSavedRoutes : removed routes:" << removed_count << "of" << m_ipForwardRows.size();
m_ipForwardRows.clear();
suspendWcmSvc(false);
return true;
}
bool RouterWin::routeDelete(const QString &ip, const QString &gw)
int RouterWin::routeDeleteList(const QString &gw, const QStringList &ips)
{
qDebug().noquote() << QString("ROUTE DELETE, IP: %1 GW %2").arg(ip).arg(gw);
// qDebug().noquote() << QString("ROUTE DELETE List: IPs size:%1, GW: %2")
// .arg(ips.size())
// .arg(gw);
QProcess p;
p.setProcessChannelMode(QProcess::MergedChannels);
QString command = QString("route delete %1 %2").arg(Utils::ipAddressFromIpWithSubnet(ip)).arg(gw);
// qDebug().noquote() << QString("ROUTE DELETE List: IPs:\n%1")
// .arg(ips.join("\n"));
p.start(command);
p.waitForFinished();
qDebug().noquote() << "OUTPUT route delete: " + p.readAll();
PMIB_IPFORWARDTABLE pIpForwardTable = NULL;
DWORD dwSize = 0;
BOOL bOrder = FALSE;
DWORD dwStatus = 0;
ULONG gw_addr= inet_addr(gw.toStdString().c_str());
return true;
// Find out how big our buffer needs to be.
dwStatus = GetIpForwardTable(pIpForwardTable, &dwSize, bOrder);
if (dwStatus == ERROR_INSUFFICIENT_BUFFER) {
// Allocate the memory for the table
if (!(pIpForwardTable = (PMIB_IPFORWARDTABLE) malloc(dwSize))) {
qDebug() << "Malloc failed. Out of memory.";
return 0;
}
// Now get the table.
dwStatus = GetIpForwardTable(pIpForwardTable, &dwSize, bOrder);
}
if (dwStatus != ERROR_SUCCESS) {
qDebug() << "getIpForwardTable failed.";
if (pIpForwardTable)
free(pIpForwardTable);
return 0;
}
int success_count = 0;
QMap<ULONG, QPair<QString,ULONG>> ipMap;
for (int i = 0; i < ips.size(); ++i) {
QString ipMask = ips.at(i);
if (ipMask.isEmpty()) continue;
QString ip = Utils::ipAddressFromIpWithSubnet(ipMask);
QString mask = Utils::netMaskFromIpWithSubnet(ipMask);
if (ip.isEmpty()) continue;
in_addr maskAddr;
inet_pton(AF_INET, mask.toStdString().c_str(), &maskAddr);
ipMap.insert(inet_addr(ip.toStdString().c_str()), qMakePair(ipMask, maskAddr.S_un.S_addr));
}
for (int i = 0; i < (int) pIpForwardTable->dwNumEntries; i++) {
MIB_IPFORWARDROW ipfrow = pIpForwardTable->table[i];
if(ipMap.contains(ipfrow.dwForwardDest) &&
ipMap.value(ipfrow.dwForwardDest).second == ipfrow.dwForwardMask &&
ipfrow.dwForwardNextHop == gw_addr) {
dwStatus = DeleteIpForwardEntry(&pIpForwardTable->table[i]);
if (dwStatus == ERROR_SUCCESS) {
m_ipForwardRows.remove(ipMap.value(ipfrow.dwForwardDest).first);
success_count++;
}
}
}
// Free resources
if (pIpForwardTable)
free(pIpForwardTable);
qDebug() << "Router::routeDeleteList finished, success: " << success_count << "/" << ips.size();
return success_count;
}
void RouterWin::flushDns()
@ -286,3 +277,137 @@ void RouterWin::flushDns()
p.waitForFinished();
//qDebug().noquote() << "OUTPUT ipconfig /flushdns: " + p.readAll();
}
void RouterWin::suspendWcmSvc(bool suspend)
{
if (suspend == m_suspended) return;
// Solve Windows bug (routes > 1000)
DWORD wcmSvcPid = GetServicePid(std::wstring(L"wcmSvc").c_str());
//ListProcessThreads(wcmSvcPid);
BOOL ok = SuspendProcess(suspend, wcmSvcPid);
if (ok) {
m_suspended = suspend;
}
qDebug() << "RouterWin::routeAddList" <<
(ok ? "succeed to" : "failed to") <<
(suspend ? "suspend wcmSvc" : "resume wcmSvc");
}
DWORD RouterWin::GetServicePid(LPCWSTR serviceName)
{
const auto hScm = OpenSCManagerW(nullptr, nullptr, NULL);
const auto hSc = OpenServiceW(hScm, serviceName, SERVICE_QUERY_STATUS);
SERVICE_STATUS_PROCESS ssp = {};
DWORD bytesNeeded = 0;
QueryServiceStatusEx(hSc, SC_STATUS_PROCESS_INFO, reinterpret_cast<LPBYTE>(&ssp), sizeof(ssp), &bytesNeeded);
CloseServiceHandle(hSc);
CloseServiceHandle(hScm);
return ssp.dwProcessId;
}
BOOL RouterWin::ListProcessThreads( DWORD dwOwnerPID )
{
HANDLE hThreadSnap = INVALID_HANDLE_VALUE;
THREADENTRY32 te32;
// Take a snapshot of all running threads
hThreadSnap = CreateToolhelp32Snapshot( TH32CS_SNAPTHREAD, 0 );
if( hThreadSnap == INVALID_HANDLE_VALUE )
return( FALSE );
// Fill in the size of the structure before using it.
te32.dwSize = sizeof(THREADENTRY32);
// Retrieve information about the first thread,
// and exit if unsuccessful
if( !Thread32First( hThreadSnap, &te32 ) )
{
//printError( TEXT("Thread32First") ); // show cause of failure
CloseHandle( hThreadSnap ); // clean the snapshot object
return( FALSE );
}
// Now walk the thread list of the system,
// and display information about each thread
// associated with the specified process
//HANDLE threadHandle;
do
{
if( te32.th32OwnerProcessID == dwOwnerPID )
{
HANDLE threadHandle = OpenThread (PROCESS_QUERY_INFORMATION, FALSE, te32.th32ThreadID);
qDebug() << "OpenThread GetLastError:"<< te32.th32ThreadID << GetLastError() << threadHandle;
ULONG64 cycles = 0;
BOOL ok = QueryThreadCycleTime(threadHandle, &cycles);
qDebug() << "QueryThreadCycleTime GetLastError:" << ok << GetLastError();
qDebug() << "Thread cycles:" << te32.th32ThreadID << cycles;
// _tprintf( TEXT("\n\n THREAD ID = 0x%08X"), te32.th32ThreadID );
// _tprintf( TEXT("\n Base priority = %d"), te32.tpBasePri );
// _tprintf( TEXT("\n Delta priority = %d"), te32.tpDeltaPri );
// _tprintf( TEXT("\n"));
CloseHandle(threadHandle);
}
} while( Thread32Next(hThreadSnap, &te32 ) );
CloseHandle( hThreadSnap );
return( TRUE );
}
BOOL RouterWin::EnableDebugPrivilege(VOID)
{
HANDLE hToken = NULL;
TOKEN_PRIVILEGES priv;
if (!OpenProcessToken(GetCurrentProcess(), TOKEN_ADJUST_PRIVILEGES, &hToken))
return FALSE;
if (!LookupPrivilegeValueW(NULL, SE_DEBUG_NAME, &priv.Privileges[0].Luid))
return FALSE;
priv.PrivilegeCount = 1;
priv.Privileges[0].Attributes = SE_PRIVILEGE_ENABLED;
return AdjustTokenPrivileges(hToken, FALSE, &priv, sizeof(priv), NULL, NULL);
}
BOOL RouterWin::InitNtFunctions(VOID)
{
HMODULE hModule;
hModule = GetModuleHandleW(L"ntdll.dll");
if (hModule == NULL)
return FALSE;
//NtSuspendProcess = (decltype(NtSuspendProcess))GetProcAddress(hModule, "NtSuspendThread");
NtSuspendProcess = (decltype(NtSuspendProcess))GetProcAddress(hModule, "NtSuspendProcess");
if (NtSuspendProcess == NULL)
return FALSE;
//NtResumeProcess = (decltype(NtResumeProcess))GetProcAddress(hModule, "NtResumeThread");
NtResumeProcess = (decltype(NtResumeProcess))GetProcAddress(hModule, "NtResumeProcess");
if (NtResumeProcess == NULL)
return FALSE;
return TRUE;
}
BOOL RouterWin::SuspendProcess(BOOL fSuspend, DWORD dwProcessId)
{
HANDLE pHandle = OpenProcess(PROCESS_SUSPEND_RESUME, FALSE, dwProcessId);
if (pHandle == NULL) return false;
bool ok = ((fSuspend ? NtSuspendProcess : NtResumeProcess)(pHandle) == STATUS_SUCCESS);
CloseHandle(pHandle);
return ok;
}

30
service/server/router_win.h
View file

@ -9,7 +9,6 @@
#include <QObject>
#ifdef Q_OS_WIN
#include <WinSock2.h> //includes Windows.h
#include <WS2tcpip.h>
@ -21,13 +20,11 @@
#include <stdint.h>
typedef uint8_t u8_t ;
#ifndef WIN32_LEAN_AND_MEAN
#define WIN32_LEAN_AND_MEAN
#endif
#endif //Q_OS_WIN
//typedef uint8_t u8_t ;
//#ifndef WIN32_LEAN_AND_MEAN
//#define WIN32_LEAN_AND_MEAN
//#endif
/**
* @brief The Router class - General class for handling ip routing
@ -38,22 +35,29 @@ class RouterWin : public QObject
public:
static RouterWin& Instance();
bool routeAdd(const QString &ip, const QString &gw);
int routeAddList(const QString &gw, const QStringList &ips);
bool clearSavedRoutes();
bool routeDelete(const QString &ip, const QString &gw);
int routeDeleteList(const QString &gw, const QStringList &ips);
void flushDns();
public slots:
void suspendWcmSvc(bool suspend);
private:
RouterWin() {}
RouterWin(RouterWin const &) = delete;
RouterWin& operator= (RouterWin const&) = delete;
#ifdef Q_OS_WIN
QList<MIB_IPFORWARDROW> ipForwardRows;
#endif
DWORD GetServicePid(LPCWSTR serviceName);
BOOL ListProcessThreads(DWORD dwOwnerPID);
BOOL EnableDebugPrivilege();
BOOL InitNtFunctions();
BOOL SuspendProcess(BOOL fSuspend, DWORD dwProcessId);
private:
QMap<QString, MIB_IPFORWARDROW> m_ipForwardRows;
bool m_suspended = false;
};
#endif // ROUTERWIN_H

4
service/server/server.pro
View file

@ -39,7 +39,9 @@ LIBS += \
-liphlpapi \
-lws2_32 \
-liphlpapi \
-lgdi32
-lgdi32 \
-lAdvapi32 \
-lKernel32
}
macx {

42
service/server/tapcontroller_win.cpp
View file

@ -240,7 +240,6 @@ bool TapController::checkDriver(const QString& tapInstanceId)
bool TapController::checkOpenVpn()
{
/// Check openvpn executable
QProcess openVpnProc;
openVpnProc.start(getOpenVpnPath(), QStringList() << "--version");
if (!openVpnProc.waitForStarted()) {
@ -257,53 +256,22 @@ bool TapController::checkOpenVpn()
QString TapController::getTapInstallPath()
{
#ifdef Q_OS_WIN
if (oldDriversRequired()) {
return qApp->applicationDirPath() + "\\tap\\"+ QSysInfo::currentCpuArchitecture() + "_windows_7\\tapinstall.exe";
}
else {
return qApp->applicationDirPath() + "\\tap\\"+ QSysInfo::currentCpuArchitecture() + "\\tapinstall.exe";
}
// if (QSysInfo::currentCpuArchitecture() == "i386") {
// return qApp->applicationDirPath() + "\\openvpn\\drivers_x32\\tapinstall.exe";
// }
// else if (QSysInfo::currentCpuArchitecture() == "x86_64") {
// return qApp->applicationDirPath() + "\\openvpn\\drivers_x64\\tapinstall.exe";
// }
// else return "";
#endif
return "";
return getTapDriverDir() + "\\tapinstall.exe";
}
QString TapController::getOpenVpnPath()
{
#ifdef Q_OS_WIN
//return qApp->applicationDirPath() + "\\openvpn\\"+ QSysInfo::currentCpuArchitecture() + "\\openvpn.exe";
return qApp->applicationDirPath() + "\\openvpn\\i386\\openvpn.exe";
#endif
return "";
return qApp->applicationDirPath() + "\\openvpn\\openvpn.exe";
}
QString TapController::getTapDriverDir()
{
if (oldDriversRequired()) {
return qApp->applicationDirPath() + "\\tap\\"+ QSysInfo::currentCpuArchitecture() + "_windows_7\\";
return qApp->applicationDirPath() + "\\tap\\windows_7";
}
else {
return qApp->applicationDirPath() + "\\tap\\"+ QSysInfo::currentCpuArchitecture() + "\\";
return qApp->applicationDirPath() + "\\tap\\windows_10";
}
// if (QSysInfo::currentCpuArchitecture() == "i386") {
// return qApp->applicationDirPath() + "\\openvpn\\drivers_x32\\";
// }
// else if (QSysInfo::currentCpuArchitecture() == "x86_64") {
// return qApp->applicationDirPath() + "\\openvpn\\drivers_x64\\";
// }
// else return "";
}
bool TapController::removeDriver(const QString& tapInstanceId)
@ -372,7 +340,7 @@ bool TapController::setupDriver()
/// else try to install driver
QProcess tapInstallProc;
tapInstallProc.start(getTapInstallPath(), QStringList() << "install" << getTapDriverDir() + "OemVista.inf" << "tap0901");
tapInstallProc.start(getTapInstallPath(), QStringList() << "install" << getTapDriverDir() + "\\OemVista.inf" << "tap0901");
bool ok = tapInstallProc.waitForStarted();
if (!ok) {
qDebug() << "TapController: setupDriver failer to start tapInstallProc" << tapInstallProc.errorString();