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

IKEv2 fixes

Browse source 
TOR fixes
tray fix
This commit is contained in:
pokamest 2021-11-18 01:40:28 +03:00
parent e0f42f4a0a
commit dde04ff979
5 changed files with 20 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
client/core/servercontroller.cpp
View file

@ -24,6 +24,12 @@
using namespace QSsh; using namespace QSsh;
Settings &ServerController::m_settings()
{
static Settings s;
return s;
}
ErrorCode ServerController::runScript(const ServerCredentials &credentials, QString script, ErrorCode ServerController::runScript(const ServerCredentials &credentials, QString script,
const std::function<void(const QString &, QSharedPointer<SshRemoteProcess>)> &cbReadStdOut, const std::function<void(const QString &, QSharedPointer<SshRemoteProcess>)> &cbReadStdOut,
const std::function<void(const QString &, QSharedPointer<SshRemoteProcess>)> &cbReadStdErr) const std::function<void(const QString &, QSharedPointer<SshRemoteProcess>)> &cbReadStdErr)
@ -678,6 +684,8 @@ ServerController::Vars ServerController::genVarsForScript(const ServerCredential
vars.append({{"$IPSEC_VPN_C2C_TRAFFIC", "no"}}); vars.append({{"$IPSEC_VPN_C2C_TRAFFIC", "no"}});
vars.append({{"$PRIMARY_SERVER_DNS", m_settings().primaryDns()}});
vars.append({{"$SECONDARY_SERVER_DNS", m_settings().secondaryDns()}});
// Sftp vars // Sftp vars

3
client/core/servercontroller.h
View file

@ -6,6 +6,8 @@
#include "sshconnection.h" #include "sshconnection.h"
#include "sshremoteprocess.h" #include "sshremoteprocess.h"
#include "defs.h" #include "defs.h"
#include "settings.h"
#include "containers/containers_defs.h" #include "containers/containers_defs.h"
#include "sftpdefs.h" #include "sftpdefs.h"
@ -75,6 +77,7 @@ private:
static ErrorCode configureContainerWorker(const ServerCredentials &credentials, DockerContainer container, QJsonObject &config); static ErrorCode configureContainerWorker(const ServerCredentials &credentials, DockerContainer container, QJsonObject &config);
static ErrorCode startupContainerWorker(const ServerCredentials &credentials, DockerContainer container, const QJsonObject &config = QJsonObject()); static ErrorCode startupContainerWorker(const ServerCredentials &credentials, DockerContainer container, const QJsonObject &config = QJsonObject());
static Settings &m_settings();
}; };
#endif // SERVERCONTROLLER_H #endif // SERVERCONTROLLER_H

6
client/server_scripts/ipsec/configure_container.sh
View file

@ -120,8 +120,8 @@ proxyarp
lcp-echo-failure 4 lcp-echo-failure 4
lcp-echo-interval 30 lcp-echo-interval 30
connect-delay 5000 connect-delay 5000
ms-dns $PRIMARY_DNS ms-dns $PRIMARY_SERVER_DNS
ms-dns $SECONDARY_DNS ms-dns $SECONDARY_SERVER_DNS
EOF EOF
@ -250,7 +250,7 @@ conn ikev2-cp
ikelifetime=24h ikelifetime=24h
salifetime=24h salifetime=24h
encapsulation=yes encapsulation=yes
modecfgdns=$PRIMARY_DNS,$SECONDARY_DNS modecfgdns=$PRIMARY_SERVER_DNS,$SECONDARY_SERVER_DNS
EOF EOF
ipsec auto --add ikev2-cp ipsec auto --add ikev2-cp

3
client/server_scripts/website_tor/run_container.sh
View file

@ -1,3 +1,6 @@
# Run container # Run container
sudo docker stop amnezia-tor
sudo docker rm amnezia-tor
sudo docker run -d -p 80:80 --restart always --name $CONTAINER_NAME tutum/wordpress sudo docker run -d -p 80:80 --restart always --name $CONTAINER_NAME tutum/wordpress
sudo docker run -d --link $CONTAINER_NAME --name amnezia-tor goldy/tor-hidden-service sudo docker run -d --link $CONTAINER_NAME --name amnezia-tor goldy/tor-hidden-service
sudo docker exec -i amnezia-tor apk add bash

4
client/ui/uilogic.cpp
View file

@ -104,6 +104,8 @@ UiLogic::UiLogic(QObject *parent) :
UiLogic::~UiLogic() UiLogic::~UiLogic()
{ {
m_tray = nullptr;
emit hide(); emit hide();
if (m_vpnConnection->connectionState() != VpnProtocol::ConnectionState::Disconnected) { if (m_vpnConnection->connectionState() != VpnProtocol::ConnectionState::Disconnected) {
@ -609,7 +611,7 @@ void UiLogic::setupTray()
void UiLogic::setTrayIcon(const QString &iconPath) void UiLogic::setTrayIcon(const QString &iconPath)
{ {
m_tray->setIcon(QIcon(QPixmap(iconPath).scaled(128,128))); if (m_tray) m_tray->setIcon(QIcon(QPixmap(iconPath).scaled(128,128)));
} }
void UiLogic::onTrayActivated(QSystemTrayIcon::ActivationReason reason) void UiLogic::onTrayActivated(QSystemTrayIcon::ActivationReason reason)