diff options
| author | Yves-Alexis Perez <corsac@debian.org> | 2016-07-16 15:19:53 +0200 |
|---|---|---|
| committer | Yves-Alexis Perez <corsac@debian.org> | 2016-07-16 15:19:53 +0200 |
| commit | a4ab9f7f145c94a5eeb950b92b95c3d362baee67 (patch) | |
| tree | b3490a4d2054b18dd1549416216557c8114329aa /conf/options | |
| parent | 7c6a8194526dc1035140a3157a07b2d9dbfedc59 (diff) | |
| parent | bf372706c469764d59e9f29c39e3ecbebd72b8d2 (diff) | |
| download | vyos-strongswan-a4ab9f7f145c94a5eeb950b92b95c3d362baee67.tar.gz vyos-strongswan-a4ab9f7f145c94a5eeb950b92b95c3d362baee67.zip | |
Merge tag 'upstream/5.5.0'
Upstream version 5.5.0
Diffstat (limited to 'conf/options')
| -rw-r--r-- | conf/options/charon.conf | 5 | ||||
| -rw-r--r-- | conf/options/charon.opt | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/conf/options/charon.conf b/conf/options/charon.conf index 5ca61a8e8..78411250e 100644 --- a/conf/options/charon.conf +++ b/conf/options/charon.conf @@ -157,6 +157,11 @@ charon { # will be allocated. # port_nat_t = 4500 + # Prefer locally configured proposals for IKE/IPsec over supplied ones as + # responder (disabling this can avoid keying retries due to + # INVALID_KE_PAYLOAD notifies). + # prefer_configured_proposals = yes + # By default public IPv6 addresses are preferred over temporary ones (RFC # 4941), to make connections more stable. Enable this option to reverse # this. diff --git a/conf/options/charon.opt b/conf/options/charon.opt index 86279ec83..3970012d2 100644 --- a/conf/options/charon.opt +++ b/conf/options/charon.opt @@ -253,6 +253,11 @@ charon.port_nat_t = 4500 allocated. Has to be different from **charon.port**, otherwise a random port will be allocated. +charon.prefer_configured_proposals = yes + Prefer locally configured proposals for IKE/IPsec over supplied ones as + responder (disabling this can avoid keying retries due to INVALID_KE_PAYLOAD + notifies). + charon.prefer_temporary_addrs = no By default public IPv6 addresses are preferred over temporary ones (RFC 4941), to make connections more stable. Enable this option to reverse this. |