Merge branch 'dev' into feature/import-config-from-cloud
This commit is contained in:
commit
147726ecb0
33 changed files with 1299 additions and 365 deletions
|
@ -43,6 +43,7 @@ namespace amnezia
|
|||
constexpr char server_priv_key[] = "server_priv_key";
|
||||
constexpr char server_pub_key[] = "server_pub_key";
|
||||
constexpr char psk_key[] = "psk_key";
|
||||
constexpr char allowed_ips[] = "allowed_ips";
|
||||
|
||||
constexpr char client_ip[] = "client_ip"; // internal ip address
|
||||
|
||||
|
@ -84,7 +85,11 @@ namespace amnezia
|
|||
constexpr char accessToken[] = "access_token";
|
||||
constexpr char certificate[] = "certificate";
|
||||
constexpr char publicKey[] = "public_key";
|
||||
}
|
||||
|
||||
constexpr char splitTunnelSites[] = "splitTunnelSites";
|
||||
constexpr char splitTunnelType[] = "splitTunnelType";
|
||||
|
||||
}
|
||||
|
||||
namespace protocols
|
||||
{
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue