mirror of
https://github.com/amnezia-vpn/amnezia-client.git
synced 2026-05-08 14:33:23 +00:00
89818ff63d
* fix: app freeze on quit
* fix: typo in VpnConnection destructor
* add trace info
* add more trace info
* set timelimit for flushDns
* Refactor IpcClient::Interface access logic
* cleanup unused variable
* cleanup trace info
* fix: remove second disconnect from VPN on app close
* this object will be deleted at app close
* Don't terminate VPN thread on Linux
* Revert "Don't terminate VPN thread on Linux"
This reverts commit 20e4ea2d4a.
* disconnect all signals from vpnconnection on exit
* add interruption request on vpnConnectionThread
* use checktimer only for iOS
* disconnect all signals from vpnconnection on exit
* disconnect signals on exit before VPN disconnect
* add disconnectSlots method
* fix: add allow traffic rules on killswitch disable
* wait for response from service before object destroy
* change disconnect from vpn order
* add delay for connection close
* change disconnect method order
* use stop method for protocol disconnecect
* change disconnect method order
* allow dns traffic after app close
* delete tun on disconnect
---------
Co-authored-by: vkamn <vk@amnezia.org>
136 lines
3.0 KiB
C++
136 lines
3.0 KiB
C++
#include "router.h"
|
|
|
|
#ifdef Q_OS_WIN
|
|
#include "router_win.h"
|
|
#elif defined (Q_OS_MAC)
|
|
#include "router_mac.h"
|
|
#elif defined Q_OS_LINUX
|
|
#include "router_linux.h"
|
|
#endif
|
|
|
|
|
|
int Router::routeAddList(const QString &gw, const QStringList &ips)
|
|
{
|
|
#ifdef Q_OS_WIN
|
|
return RouterWin::Instance().routeAddList(gw, ips);
|
|
#elif defined (Q_OS_MAC)
|
|
return RouterMac::Instance().routeAddList(gw, ips);
|
|
#elif defined Q_OS_LINUX
|
|
return RouterLinux::Instance().routeAddList(gw, ips);
|
|
#endif
|
|
}
|
|
|
|
bool Router::clearSavedRoutes()
|
|
{
|
|
#ifdef Q_OS_WIN
|
|
return RouterWin::Instance().clearSavedRoutes();
|
|
#elif defined (Q_OS_MAC)
|
|
return RouterMac::Instance().clearSavedRoutes();
|
|
#elif defined Q_OS_LINUX
|
|
return RouterLinux::Instance().clearSavedRoutes();
|
|
#endif
|
|
}
|
|
|
|
int Router::routeDeleteList(const QString &gw, const QStringList &ips)
|
|
{
|
|
#ifdef Q_OS_WIN
|
|
return RouterWin::Instance().routeDeleteList(gw, ips);
|
|
#elif defined (Q_OS_MAC)
|
|
return RouterMac::Instance().routeDeleteList(gw, ips);
|
|
#elif defined Q_OS_LINUX
|
|
return RouterLinux::Instance().routeDeleteList(gw, ips);
|
|
#endif
|
|
}
|
|
|
|
bool Router::flushDns()
|
|
{
|
|
#ifdef Q_OS_WIN
|
|
return RouterWin::Instance().flushDns();
|
|
#elif defined (Q_OS_MAC)
|
|
return RouterMac::Instance().flushDns();
|
|
#elif defined Q_OS_LINUX
|
|
return RouterLinux::Instance().flushDns();
|
|
#endif
|
|
}
|
|
|
|
void Router::resetIpStack()
|
|
{
|
|
#ifdef Q_OS_WIN
|
|
RouterWin::Instance().resetIpStack();
|
|
#elif defined (Q_OS_MAC)
|
|
// todo fixme
|
|
#elif defined Q_OS_LINUX
|
|
// todo fixme
|
|
#endif
|
|
}
|
|
|
|
bool Router::createTun(const QString &dev, const QString &subnet)
|
|
{
|
|
#ifdef Q_OS_LINUX
|
|
return RouterLinux::Instance().createTun(dev, subnet);
|
|
#endif
|
|
#ifdef Q_OS_MAC
|
|
return RouterMac::Instance().createTun(dev, subnet);
|
|
#endif
|
|
return true;
|
|
};
|
|
|
|
bool Router::deleteTun(const QString &dev)
|
|
{
|
|
#ifdef Q_OS_LINUX
|
|
return RouterLinux::Instance().deleteTun(dev);
|
|
#endif
|
|
#ifdef Q_OS_MAC
|
|
return RouterMac::Instance().deleteTun(dev);
|
|
#endif
|
|
return true;
|
|
};
|
|
|
|
bool Router::updateResolvers(const QString& ifname, const QList<QHostAddress>& resolvers)
|
|
{
|
|
#ifdef Q_OS_LINUX
|
|
return RouterLinux::Instance().updateResolvers(ifname, resolvers);
|
|
#endif
|
|
#ifdef Q_OS_MACOS
|
|
return RouterMac::Instance().updateResolvers(ifname, resolvers);
|
|
#endif
|
|
#ifdef Q_OS_WIN
|
|
return RouterWin::Instance().updateResolvers(ifname, resolvers);
|
|
#endif
|
|
}
|
|
|
|
bool Router::restoreResolvers() {
|
|
#ifdef Q_OS_LINUX
|
|
return RouterLinux::Instance().restoreResolvers();
|
|
#endif
|
|
#ifdef Q_OS_MACOS
|
|
return RouterMac::Instance().restoreResolvers();
|
|
#endif
|
|
#ifdef Q_OS_WIN
|
|
return RouterWin::Instance().restoreResolvers();
|
|
#endif
|
|
}
|
|
|
|
bool Router::StopRoutingIpv6()
|
|
{
|
|
#ifdef Q_OS_WIN
|
|
return RouterWin::Instance().StopRoutingIpv6();
|
|
#elif defined (Q_OS_MAC)
|
|
return true;// todo fixme
|
|
#elif defined Q_OS_LINUX
|
|
return RouterLinux::Instance().StopRoutingIpv6();
|
|
#endif
|
|
}
|
|
|
|
bool Router::StartRoutingIpv6()
|
|
{
|
|
#ifdef Q_OS_WIN
|
|
return RouterWin::Instance().StartRoutingIpv6();
|
|
#elif defined (Q_OS_MAC)
|
|
return true;// todo fixme
|
|
#elif defined Q_OS_LINUX
|
|
return RouterLinux::Instance().StartRoutingIpv6();
|
|
#endif
|
|
}
|
|
|