stroke: re-enable modeconfig keyword
authorMartin Willi <martin@revosec.ch>
Fri, 19 Jul 2013 13:47:33 +0000 (15:47 +0200)
committerMartin Willi <martin@revosec.ch>
Wed, 4 Sep 2013 08:33:38 +0000 (10:33 +0200)
src/libcharon/plugins/stroke/stroke_config.c
src/starter/starterstroke.c
src/stroke/stroke_msg.h

index facea5e..2b16ad6 100644 (file)
@@ -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);
 
index cc447c4..f454193 100644 (file)
@@ -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);
index a4dfc5e..6c8dcf5 100644 (file)
@@ -258,6 +258,7 @@ struct stroke_msg_t {
                        int mode;
                        int mobike;
                        int aggressive;
+                       int pushmode;
                        int force_encap;
                        int fragmentation;
                        int ipcomp;