stroke: re-enable modeconfig keyword

diff --git a/src/libcharon/plugins/stroke/stroke_config.c b/src/libcharon/plugins/stroke/stroke_config.c
index facea5e6fdbefa904cd9c1f4731adad18b1c1eeb..2b16ad6835714b5f32e0de4f4e87d2333807d08e 100644 (file)
--- 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 cc447c41f33c5923a4a295ddeefa84bd7f91300c..f4541937b96b15b37b959cdbe5a2e6c035dba4ed 100644 (file)
--- 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 a4dfc5e7ac7d88d857cb027d5b707dd49db79a6e..6c8dcf5f93f9b2d00bda159f1d67032842fcddba 100644 (file)
--- 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;