diff options
| author | Martin Willi <martin@revosec.ch> | 2013-09-04 10:35:26 +0200 |
|---|---|---|
| committer | Martin Willi <martin@revosec.ch> | 2013-09-04 10:35:26 +0200 |
| commit | f7cb6eaaa88d8f43e7d65fbca5f81d9c117aa959 (patch) | |
| tree | e4065153815b9eebc0e7bf2b19a8b8372b046760 /src/libcharon/plugins/stroke/stroke_config.c | |
| parent | 0b47bb5377193520d8d95fe66d6d3644abaf2307 (diff) | |
| parent | a858064455bc2fda9f54889395eccee8f91fd424 (diff) | |
| download | strongswan-f7cb6eaaa88d8f43e7d65fbca5f81d9c117aa959.tar.bz2 strongswan-f7cb6eaaa88d8f43e7d65fbca5f81d9c117aa959.tar.xz | |
Merge branch 'ikev1-pushmode'
Implements Mode Config Push mode in IKEv1 using the existing modeconfig=push
ipsec.conf option.
Diffstat (limited to 'src/libcharon/plugins/stroke/stroke_config.c')
| -rw-r--r-- | src/libcharon/plugins/stroke/stroke_config.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/libcharon/plugins/stroke/stroke_config.c b/src/libcharon/plugins/stroke/stroke_config.c index 079e65f11..2e36ce3a3 100644 --- a/src/libcharon/plugins/stroke/stroke_config.c +++ b/src/libcharon/plugins/stroke/stroke_config.c @@ -731,6 +731,7 @@ static peer_cfg_t *build_peer_cfg(private_stroke_config_t *this, msg->add_conn.me.sendcert, unique, msg->add_conn.rekey.tries, rekey, reauth, jitter, over, msg->add_conn.mobike, msg->add_conn.aggressive, + msg->add_conn.pushmode == 0, msg->add_conn.dpd.delay, msg->add_conn.dpd.timeout, msg->add_conn.ikeme.mediation, mediated_by, peer_id); @@ -780,7 +781,13 @@ static peer_cfg_t *build_peer_cfg(private_stroke_config_t *this, enumerator->destroy(enumerator); } - if (msg->add_conn.me.sourceip) + if (msg->add_conn.me.sourceip && msg->add_conn.other.sourceip) + { + DBG1(DBG_CFG, "'%s' has both left- and rightsourceip, but IKE can " + "negotiate one virtual IP only, ignoring local virtual IP", + msg->add_conn.name); + } + else if (msg->add_conn.me.sourceip) { enumerator_t *enumerator; char *token; |