diff options
author | Tobias Brunner <tobias@strongswan.org> | 2013-01-12 11:58:26 +0100 |
---|---|---|
committer | Tobias Brunner <tobias@strongswan.org> | 2013-01-12 11:58:26 +0100 |
commit | 21235e1ec247b1d1bd58096f72d4f0dc21cec66f (patch) | |
tree | 97f8ee3441c0c2ec6c3318a4b02b836a4edf91ab /src/conftest/config.c | |
parent | 54a1a75b2f5f3a9419eb5c18c07173827d5c9b39 (diff) | |
parent | f31b418094f2f9deb9a69244bf01e8d5dd4c3337 (diff) | |
download | strongswan-21235e1ec247b1d1bd58096f72d4f0dc21cec66f.tar.bz2 strongswan-21235e1ec247b1d1bd58096f72d4f0dc21cec66f.tar.xz |
Merge branch 'ikev1-fragmentation'
This adds support for the proprietary IKEv1 fragmentation extension.
Conflicts:
NEWS
Diffstat (limited to 'src/conftest/config.c')
-rw-r--r-- | src/conftest/config.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/conftest/config.c b/src/conftest/config.c index f896b9537..22c9d23e0 100644 --- a/src/conftest/config.c +++ b/src/conftest/config.c @@ -106,7 +106,8 @@ static ike_cfg_t *load_ike_config(private_config_t *this, settings->get_str(settings, "configs.%s.lhost", "%any", config), FALSE, settings->get_int(settings, "configs.%s.lport", 500, config), settings->get_str(settings, "configs.%s.rhost", "%any", config), FALSE, - settings->get_int(settings, "configs.%s.rport", 500, config)); + settings->get_int(settings, "configs.%s.rport", 500, config), + FRAGMENTATION_NO); token = settings->get_str(settings, "configs.%s.proposal", NULL, config); if (token) { |