diff options
| author | Tobias Brunner <tobias@strongswan.org> | 2016-06-01 12:18:56 +0200 |
|---|---|---|
| committer | Tobias Brunner <tobias@strongswan.org> | 2016-06-17 18:48:07 +0200 |
| commit | 0a954d678979624806a2d250208530291da34e32 (patch) | |
| tree | 96daddf9186cb030b621fdf8bd5ba5e750994aa3 /src/libcharon/sa/ikev1/tasks/quick_mode.c | |
| parent | f2ea230b91d050a4fddc84a55068107046b1708f (diff) | |
| download | strongswan-0a954d678979624806a2d250208530291da34e32.tar.bz2 strongswan-0a954d678979624806a2d250208530291da34e32.tar.xz | |
ike: Add configuration option to switch to preferring supplied proposals over local ones
Diffstat (limited to 'src/libcharon/sa/ikev1/tasks/quick_mode.c')
| -rw-r--r-- | src/libcharon/sa/ikev1/tasks/quick_mode.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/libcharon/sa/ikev1/tasks/quick_mode.c b/src/libcharon/sa/ikev1/tasks/quick_mode.c index 70bc37016..bbd1cb09f 100644 --- a/src/libcharon/sa/ikev1/tasks/quick_mode.c +++ b/src/libcharon/sa/ikev1/tasks/quick_mode.c @@ -1051,7 +1051,7 @@ METHOD(task_t, process_r, status_t, linked_list_t *tsi, *tsr, *hostsi, *hostsr, *list = NULL; peer_cfg_t *peer_cfg; uint16_t group; - bool private; + bool private, prefer_configured; sa_payload = (sa_payload_t*)message->get_payload(message, PLV1_SECURITY_ASSOCIATION); @@ -1109,8 +1109,10 @@ METHOD(task_t, process_r, status_t, } private = this->ike_sa->supports_extension(this->ike_sa, EXT_STRONGSWAN); + prefer_configured = lib->settings->get_bool(lib->settings, + "%s.prefer_configured_proposals", TRUE, lib->ns); this->proposal = this->config->select_proposal(this->config, list, - FALSE, private, TRUE); + FALSE, private, prefer_configured); list->destroy_offset(list, offsetof(proposal_t, destroy)); get_lifetimes(this); |