diff options
| author | Martin Willi <martin@revosec.ch> | 2013-07-19 15:47:33 +0200 |
|---|---|---|
| committer | Martin Willi <martin@revosec.ch> | 2013-09-04 10:33:38 +0200 |
| commit | 2bae838d5e897127a06e9ede9b192bf29e793c3c (patch) | |
| tree | 1b038b9d27fb3f418d20dccf98fa383507de5541 | |
| parent | 9aeaa7396efd0df49bffbf2374fae634da90bda1 (diff) | |
| download | strongswan-2bae838d5e897127a06e9ede9b192bf29e793c3c.tar.bz2 strongswan-2bae838d5e897127a06e9ede9b192bf29e793c3c.tar.xz | |
stroke: re-enable modeconfig keyword
| -rw-r--r-- | src/libcharon/plugins/stroke/stroke_config.c | 2 | ||||
| -rw-r--r-- | src/starter/starterstroke.c | 1 | ||||
| -rw-r--r-- | src/stroke/stroke_msg.h | 1 |
3 files changed, 3 insertions, 1 deletions
diff --git a/src/libcharon/plugins/stroke/stroke_config.c b/src/libcharon/plugins/stroke/stroke_config.c index facea5e6f..2b16ad683 100644 --- a/src/libcharon/plugins/stroke/stroke_config.c +++ b/src/libcharon/plugins/stroke/stroke_config.c @@ -731,7 +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, - TRUE, + msg->add_conn.pushmode == 0, msg->add_conn.dpd.delay, msg->add_conn.dpd.timeout, msg->add_conn.ikeme.mediation, mediated_by, peer_id); diff --git a/src/starter/starterstroke.c b/src/starter/starterstroke.c index cc447c41f..f4541937b 100644 --- a/src/starter/starterstroke.c +++ b/src/starter/starterstroke.c @@ -186,6 +186,7 @@ int starter_stroke_add_conn(starter_config_t *cfg, starter_conn_t *conn) msg.add_conn.ipcomp = conn->options & SA_OPTION_COMPRESS; msg.add_conn.install_policy = conn->install_policy; msg.add_conn.aggressive = conn->aggressive; + msg.add_conn.pushmode = conn->options & SA_OPTION_MODECFG_PUSH; msg.add_conn.crl_policy = (crl_policy_t)cfg->setup.strictcrlpolicy; msg.add_conn.unique = cfg->setup.uniqueids; msg.add_conn.algorithms.ike = push_string(&msg, conn->ike); diff --git a/src/stroke/stroke_msg.h b/src/stroke/stroke_msg.h index a4dfc5e7a..6c8dcf5f9 100644 --- a/src/stroke/stroke_msg.h +++ b/src/stroke/stroke_msg.h @@ -258,6 +258,7 @@ struct stroke_msg_t { int mode; int mobike; int aggressive; + int pushmode; int force_encap; int fragmentation; int ipcomp; |