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

Add protocol name to json connection config

Browse source
This commit is contained in:
pokamest 2021-10-08 00:50:26 +03:00
parent 344d23bad1
commit d275702080
2 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
client/protocols/protocols_defs.h
View file

@ -24,6 +24,7 @@ constexpr char containers[] = "containers";
constexpr char container[] = "container"; constexpr char container[] = "container";
constexpr char defaultContainer[] = "defaultContainer"; constexpr char defaultContainer[] = "defaultContainer";
constexpr char protocol[] = "protocol";
constexpr char protocols[] = "protocols"; constexpr char protocols[] = "protocols";
constexpr char remote[] = "remote"; constexpr char remote[] = "remote";

4
client/vpnconnection.cpp
View file

@ -211,6 +211,9 @@ QJsonObject VpnConnection::createVpnConfiguration(int serverIndex,
} }
Protocol proto = ContainerProps::defaultProtocol(container);
vpnConfiguration[config_key::protocol] = ProtocolProps::protoToString(proto);
return vpnConfiguration; return vpnConfiguration;
} }
@ -248,7 +251,6 @@ ErrorCode VpnConnection::connectToVpn(int serverIndex,
#else #else
Protocol proto = ContainerProps::defaultProtocol(container);
AndroidVpnProtocol *androidVpnProtocol = new AndroidVpnProtocol(proto, m_vpnConfiguration); AndroidVpnProtocol *androidVpnProtocol = new AndroidVpnProtocol(proto, m_vpnConfiguration);
androidVpnProtocol->initialize(); androidVpnProtocol->initialize();
m_vpnProtocol.reset(androidVpnProtocol); m_vpnProtocol.reset(androidVpnProtocol);