mirror of
https://github.com/amnezia-vpn/amnezia-client.git
synced 2026-07-06 08:56:27 +03:00
Compare commits
1 Commits
dev
...
fix/openvp
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
4e59b7a709 |
@@ -356,6 +356,8 @@ if(WIN32)
|
||||
|
||||
find_package(wintun REQUIRED)
|
||||
list(APPEND CONAN_BINS $<TARGET_FILE:zx2c4::wintun>)
|
||||
|
||||
list(APPEND CONAN_BINS $<TARGET_FILE:OpenSSL::SSL> $<TARGET_FILE:OpenSSL::Crypto>)
|
||||
else()
|
||||
find_package(awg-go REQUIRED)
|
||||
list(APPEND CONAN_EXECS $<TARGET_FILE:amnezia::awg-go>)
|
||||
@@ -376,8 +378,6 @@ add_custom_command(TARGET ${PROJECT} POST_BUILD
|
||||
"$<TARGET_FILE_DIR:${PROJECT}>"
|
||||
)
|
||||
if(WIN32)
|
||||
# using PERMISSIONS on Windows appends read-only flag
|
||||
# to the files so just omit it for it
|
||||
install(FILES ${CONAN_EXECS}
|
||||
DESTINATION ${CMAKE_INSTALL_BINDIR}
|
||||
COMPONENT AmneziaVPN
|
||||
|
||||
@@ -6,9 +6,10 @@
|
||||
#include <QOperatingSystemVersion>
|
||||
|
||||
#include "tapcontroller_win.h"
|
||||
#include "core/utils/utilities.h"
|
||||
|
||||
#define TAP_EXE_ERROR { \
|
||||
qDebug() << "TapController: Can't start tapinstall.exe"; \
|
||||
qDebug() << "TapController: Can't start devcon.exe"; \
|
||||
return false; \
|
||||
}
|
||||
|
||||
@@ -76,7 +77,7 @@ QStringList TapController::getTapList()
|
||||
QProcess tapInstallProc;
|
||||
tapInstallProc.start(getTapInstallPath(), QStringList() << "find" << "tap0901" );
|
||||
if(!tapInstallProc.waitForStarted()) {
|
||||
qDebug() << "TapController: TapController: Can't start tapinstall.exe";
|
||||
qDebug() << "TapController: Can't start devcon.exe";
|
||||
return QStringList();
|
||||
}
|
||||
tapInstallProc.waitForFinished();
|
||||
@@ -256,22 +257,17 @@ bool TapController::checkOpenVpn()
|
||||
|
||||
QString TapController::getTapInstallPath()
|
||||
{
|
||||
return getTapDriverDir() + "\\tapinstall.exe";
|
||||
return getTapDriverDir() + "\\devcon.exe";
|
||||
}
|
||||
|
||||
QString TapController::getOpenVpnPath()
|
||||
{
|
||||
return qApp->applicationDirPath() + "\\openvpn\\openvpn.exe";
|
||||
return Utils::openVpnExecPath();
|
||||
}
|
||||
|
||||
QString TapController::getTapDriverDir()
|
||||
{
|
||||
if (oldDriversRequired()) {
|
||||
return qApp->applicationDirPath() + "\\tap\\windows_7";
|
||||
}
|
||||
else {
|
||||
return qApp->applicationDirPath() + "\\tap\\windows_10";
|
||||
}
|
||||
return qApp->applicationDirPath() + "\\tap";
|
||||
}
|
||||
|
||||
bool TapController::removeDriver(const QString& tapInstanceId)
|
||||
|
||||
Reference in New Issue
Block a user