mirror of
https://github.com/amnezia-vpn/amnezia-client.git
synced 2026-06-24 02:00:24 +07:00
Merge branch 'dev' into feature/tun2socksSrv
This commit is contained in:
@@ -199,7 +199,7 @@ QString WireguardConfigurator::createConfig(const ServerCredentials &credentials
|
|||||||
jConfig[config_key::server_pub_key] = connData.serverPubKey;
|
jConfig[config_key::server_pub_key] = connData.serverPubKey;
|
||||||
jConfig[config_key::mtu] = wireguarConfig.value(config_key::mtu).toString(protocols::wireguard::defaultMtu);
|
jConfig[config_key::mtu] = wireguarConfig.value(config_key::mtu).toString(protocols::wireguard::defaultMtu);
|
||||||
|
|
||||||
jConfig[config_key::persistent_keep_alive] = 25;
|
jConfig[config_key::persistent_keep_alive] = "25";
|
||||||
QJsonArray allowedIps { "0.0.0.0/0", "::/0" };
|
QJsonArray allowedIps { "0.0.0.0/0", "::/0" };
|
||||||
jConfig[config_key::allowed_ips] = allowedIps;
|
jConfig[config_key::allowed_ips] = allowedIps;
|
||||||
|
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ struct WGConfig: Decodable {
|
|||||||
let serverPublicKey: String
|
let serverPublicKey: String
|
||||||
let presharedKey: String?
|
let presharedKey: String?
|
||||||
var allowedIPs: [String]
|
var allowedIPs: [String]
|
||||||
var persistentKeepAlive: Int
|
var persistentKeepAlive: String
|
||||||
let splitTunnelType: Int
|
let splitTunnelType: Int
|
||||||
let splitTunnelSites: [String]
|
let splitTunnelSites: [String]
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user