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

NewServerSettings qml rework

Browse source
This commit is contained in:
Pokamest Nikak 2021-09-09 20:15:44 +03:00
parent 3175bc1e48
commit 40fa2d6779
34 changed files with 644 additions and 255 deletions
Download patch file Download diff file Expand all files Collapse all files

2
client/protocols/openvpnovercloakprotocol.cpp
View file

@ -2,7 +2,7 @@
#include "core/servercontroller.h"
#include "utils.h"
#include "protocols/protocols_defs.h"
#include "containers/containers_defs.h"
#include <QCryptographicHash>
#include <QDebug>

42
client/protocols/protocols_defs.cpp
View file

@ -8,14 +8,6 @@ QDebug operator<<(QDebug debug, const amnezia::Protocol &p)
return debug;
}
QDebug operator<<(QDebug debug, const amnezia::DockerContainer &c)
{
QDebugStateSaver saver(debug);
debug.nospace() << containerToString(c);
return debug;
}
amnezia::Protocol amnezia::protoFromString(QString proto){
if (proto == config_key::openvpn) return Protocol::OpenVpn;
if (proto == config_key::cloak) return Protocol::Cloak;
@ -34,24 +26,6 @@ QString amnezia::protoToString(amnezia::Protocol proto){
}
}
amnezia::DockerContainer amnezia::containerFromString(const QString &container){
if (container == config_key::amnezia_openvpn) return DockerContainer::OpenVpn;
if (container == config_key::amnezia_openvpn_cloak) return DockerContainer::OpenVpnOverCloak;
if (container == config_key::amnezia_shadowsocks) return DockerContainer::OpenVpnOverShadowSocks;
if (container == config_key::amnezia_wireguard) return DockerContainer::WireGuard;
return DockerContainer::None;
}
QString amnezia::containerToString(amnezia::DockerContainer container){
switch (container) {
case(DockerContainer::OpenVpn): return config_key::amnezia_openvpn;
case(DockerContainer::OpenVpnOverCloak): return config_key::amnezia_openvpn_cloak;
case(DockerContainer::OpenVpnOverShadowSocks): return config_key::amnezia_shadowsocks;
case(DockerContainer::WireGuard): return config_key::amnezia_wireguard;
default: return "none";
}
}
QVector<amnezia::Protocol> amnezia::allProtocols()
{
return QVector<amnezia::Protocol> {
@ -62,19 +36,3 @@ QVector<amnezia::Protocol> amnezia::allProtocols()
};
}
QVector<amnezia::Protocol> amnezia::protocolsForContainer(amnezia::DockerContainer container)
{
switch (container) {
case DockerContainer::OpenVpn:
return { Protocol::OpenVpn };
case DockerContainer::OpenVpnOverShadowSocks:
return { Protocol::OpenVpn, Protocol::ShadowSocks };
case DockerContainer::OpenVpnOverCloak:
return { Protocol::OpenVpn, Protocol::ShadowSocks, Protocol::Cloak };
default:
return {};
}
}

14
client/protocols/protocols_defs.h
View file

@ -126,22 +126,8 @@ Protocol protoFromString(QString proto);
QString protoToString(Protocol proto);
enum class DockerContainer {
None,
OpenVpn,
OpenVpnOverShadowSocks,
OpenVpnOverCloak,
WireGuard
};
DockerContainer containerFromString(const QString &container);
QString containerToString(DockerContainer container);
QVector<Protocol> protocolsForContainer(DockerContainer container);
} // namespace amnezia
QDebug operator<<(QDebug debug, const amnezia::Protocol &p);
QDebug operator<<(QDebug debug, const amnezia::DockerContainer &c);
#endif // PROTOCOLS_DEFS_H

2
client/protocols/shadowsocksvpnprotocol.cpp
View file

@ -3,7 +3,7 @@
#include "debug.h"
#include "utils.h"
#include "protocols/protocols_defs.h"
#include "containers/containers_defs.h"
#include <QCryptographicHash>
#include <QJsonDocument>

2
client/protocols/shadowsocksvpnprotocol.h
View file

@ -3,7 +3,7 @@
#include "openvpnprotocol.h"
#include "QProcess"
#include "protocols/protocols_defs.h"
#include "containers/containers_defs.h"
class ShadowSocksVpnProtocol : public OpenVpnProtocol
{

2
client/protocols/vpnprotocol.cpp
View file

@ -3,7 +3,7 @@
#include "vpnprotocol.h"
#include "core/errorstrings.h"
#include "protocols/protocols_defs.h"
#include "containers/containers_defs.h"
VpnProtocol::VpnProtocol(const QJsonObject &configuration, QObject* parent)
: QObject(parent),