peer-cfg: add a pull/push mode option to use with mode config

diff --git a/src/charon-cmd/cmd/cmd_connection.c b/src/charon-cmd/cmd/cmd_connection.c
index 5c459f99f59ac4ee54e4f1bc25a079efed5fa9cc..a697da8045d7aae58daa51a79e1e308d2af24f4f 100644 (file)
--- a/src/charon-cmd/cmd/cmd_connection.c
+++ b/src/charon-cmd/cmd/cmd_connection.c
@@ -170,7 +170,7 @@ static peer_cfg_t* create_peer_cfg(private_cmd_connection_t *this)
                                        CERT_SEND_IF_ASKED, UNIQUE_REPLACE, 1, /* keyingtries */
                                        36000, 0, /* rekey 10h, reauth none */
                                        600, 600, /* jitter, over 10min */
-                                       TRUE, aggressive, /* mobike, aggressive */
+                                       TRUE, aggressive, TRUE, /* mobike, aggressive, pull */
                                        30, 0, /* DPD delay, timeout */
                                        FALSE, NULL, NULL); /* mediation */
        peer_cfg->add_virtual_ip(peer_cfg, host_create_from_string("0.0.0.0", 0));

diff --git a/src/charon-nm/nm/nm_service.c b/src/charon-nm/nm/nm_service.c
index 901abd348eda9942a5c66deb2700a4ccd3b712f5..f97c11c18040ad07e9f3be1ddc614fa518e4e6dd 100644 (file)
--- a/src/charon-nm/nm/nm_service.c
+++ b/src/charon-nm/nm/nm_service.c
@@ -536,7 +536,7 @@ static gboolean connect_(NMVPNPlugin *plugin, NMConnection *connection,
                                        CERT_SEND_IF_ASKED, UNIQUE_REPLACE, 1, /* keyingtries */
                                        36000, 0, /* rekey 10h, reauth none */
                                        600, 600, /* jitter, over 10min */
-                                       TRUE, FALSE, /* mobike, aggressive */
+                                       TRUE, FALSE, TRUE, /* mobike, aggressive, pull */
                                        0, 0, /* DPD delay, timeout */
                                        FALSE, NULL, NULL); /* mediation */
        if (virtual)

diff --git a/src/conftest/config.c b/src/conftest/config.c
index 7f05e9c72b1f5c2e8c9e5a9218cb827ba847f208..1aa931004b7e38d22e086dc8ff1de9645b3b5ef0 100644 (file)
--- a/src/conftest/config.c
+++ b/src/conftest/config.c
@@ -249,8 +249,8 @@ static peer_cfg_t *load_peer_config(private_config_t *this,
 
        ike_cfg = load_ike_config(this, settings, config);
        peer_cfg = peer_cfg_create(config, ike_cfg, CERT_ALWAYS_SEND,
-                                                          UNIQUE_NO, 1, 0, 0, 0, 0, FALSE, FALSE, 0, 0,
-                                                          FALSE, NULL, NULL);
+                                                          UNIQUE_NO, 1, 0, 0, 0, 0, FALSE, FALSE, TRUE,
+                                                          0, 0, FALSE, NULL, NULL);
 
        auth = auth_cfg_create();
        auth->add(auth, AUTH_RULE_AUTH_CLASS, AUTH_CLASS_PUBKEY);

diff --git a/src/frontends/android/jni/libandroidbridge/backend/android_service.c b/src/frontends/android/jni/libandroidbridge/backend/android_service.c
index c35d348bab93fb2387b780d1900f30bc32945895..59a4e14cf37dcd6c4a86d5b25766ec77367be497 100644 (file)
--- a/src/frontends/android/jni/libandroidbridge/backend/android_service.c
+++ b/src/frontends/android/jni/libandroidbridge/backend/android_service.c
@@ -535,7 +535,7 @@ static job_requeue_t initiate(private_android_service_t *this)
                                                           UNIQUE_REPLACE, 0, /* keyingtries */
                                                           36000, 0, /* rekey 10h, reauth none */
                                                           600, 600, /* jitter, over 10min */
-                                                          TRUE, FALSE, /* mobike, aggressive */
+                                                          TRUE, FALSE, TRUE, /* mobike, aggressive, pull */
                                                           0, 0, /* DPD delay, timeout */
                                                           FALSE, NULL, NULL); /* mediation */
        peer_cfg->add_virtual_ip(peer_cfg, host_create_any(AF_INET));

diff --git a/src/frontends/osx/charon-xpc/xpc_dispatch.c b/src/frontends/osx/charon-xpc/xpc_dispatch.c
index 0a5de15fdd6dbbceb2c50eac9053b60975add9d3..0757e9baf8625e596d057c88caf5fb4118373532 100644 (file)
--- a/src/frontends/osx/charon-xpc/xpc_dispatch.c
+++ b/src/frontends/osx/charon-xpc/xpc_dispatch.c
@@ -91,7 +91,7 @@ static peer_cfg_t* create_peer_cfg(char *name, char *host)
                                                           CERT_SEND_IF_ASKED, UNIQUE_REPLACE, 1, /* keyingtries */
                                                           36000, 0, /* rekey 10h, reauth none */
                                                           600, 600, /* jitter, over 10min */
-                                                          TRUE, FALSE, /* mobike, aggressive */
+                                                          TRUE, FALSE, TRUE, /* mobike, aggressive, pull */
                                                           30, 0, /* DPD delay, timeout */
                                                           FALSE, NULL, NULL); /* mediation */
        peer_cfg->add_virtual_ip(peer_cfg, host_create_from_string("0.0.0.0", 0));

diff --git a/src/libcharon/config/peer_cfg.c b/src/libcharon/config/peer_cfg.c
index eb983199bbe17d3236a1c36299133728dd7f7af6..d198503d0dfffe0351b9ba449f45de894a7c5d61 100644 (file)
--- a/src/libcharon/config/peer_cfg.c
+++ b/src/libcharon/config/peer_cfg.c
@@ -99,6 +99,11 @@ struct private_peer_cfg_t {
         */
        bool aggressive;
 
+       /**
+        * Use pull or push in mode config?
+        */
+       bool pull_mode;
+
        /**
         * Time before starting rekeying
         */
@@ -390,6 +395,12 @@ METHOD(peer_cfg_t, use_aggressive, bool,
        return this->aggressive;
 }
 
+METHOD(peer_cfg_t, use_pull_mode, bool,
+       private_peer_cfg_t *this)
+{
+       return this->pull_mode;
+}
+
 METHOD(peer_cfg_t, get_dpd, u_int32_t,
        private_peer_cfg_t *this)
 {
@@ -588,6 +599,7 @@ METHOD(peer_cfg_t, equals, bool,
                this->over_time == other->over_time &&
                this->dpd == other->dpd &&
                this->aggressive == other->aggressive &&
+               this->pull_mode == other->pull_mode &&
                auth_cfg_equal(this, other)
 #ifdef ME
                && this->mediation == other->mediation &&
@@ -638,8 +650,8 @@ peer_cfg_t *peer_cfg_create(char *name,
                                                        unique_policy_t unique, u_int32_t keyingtries,
                                                        u_int32_t rekey_time, u_int32_t reauth_time,
                                                        u_int32_t jitter_time, u_int32_t over_time,
-                                                       bool mobike, bool aggressive, u_int32_t dpd,
-                                                       u_int32_t dpd_timeout,
+                                                       bool mobike, bool aggressive, bool pull_mode,
+                                                       u_int32_t dpd, u_int32_t dpd_timeout,
                                                        bool mediation, peer_cfg_t *mediated_by,
                                                        identification_t *peer_id)
 {
@@ -671,6 +683,7 @@ peer_cfg_t *peer_cfg_create(char *name,
                        .get_over_time = _get_over_time,
                        .use_mobike = _use_mobike,
                        .use_aggressive = _use_aggressive,
+                       .use_pull_mode = _use_pull_mode,
                        .get_dpd = _get_dpd,
                        .get_dpd_timeout = _get_dpd_timeout,
                        .add_virtual_ip = _add_virtual_ip,
@@ -701,6 +714,7 @@ peer_cfg_t *peer_cfg_create(char *name,
                .over_time = over_time,
                .use_mobike = mobike,
                .aggressive = aggressive,
+               .pull_mode = pull_mode,
                .dpd = dpd,
                .dpd_timeout = dpd_timeout,
                .vips = linked_list_create(),

diff --git a/src/libcharon/config/peer_cfg.h b/src/libcharon/config/peer_cfg.h
index e62e03ec5cff5480b077d6c6954954be13c7eee8..7e82b517fe66ee5e031c73c0eb012a6f7c10f93f 100644 (file)
--- a/src/libcharon/config/peer_cfg.h
+++ b/src/libcharon/config/peer_cfg.h
@@ -247,6 +247,13 @@ struct peer_cfg_t {
         */
        bool (*use_aggressive)(peer_cfg_t *this);
 
+       /**
+        * Use pull or push mode for mode config?
+        *
+        * @return                      TRUE to use pull, FALSE to use push mode
+        */
+       bool (*use_pull_mode)(peer_cfg_t *this);
+
        /**
         * Get the DPD check interval.
         *
@@ -366,6 +373,7 @@ struct peer_cfg_t {
  * @param over_time                    maximum overtime before closing a rekeying/reauth SA
  * @param mobike                       use MOBIKE (RFC4555) if peer supports it
  * @param aggressive           use/accept aggressive mode with IKEv1
+ * @param pullmode                     TRUE to use modeconfig pull, FALSE for push
  * @param dpd                          DPD check interval, 0 to disable
  * @param dpd_timeout          DPD timeout interval (IKEv1 only), if 0 default applies
  * @param mediation                    TRUE if this is a mediation connection
@@ -378,8 +386,8 @@ peer_cfg_t *peer_cfg_create(char *name,
                                                        unique_policy_t unique, u_int32_t keyingtries,
                                                        u_int32_t rekey_time, u_int32_t reauth_time,
                                                        u_int32_t jitter_time, u_int32_t over_time,
-                                                       bool mobike, bool aggressive, u_int32_t dpd,
-                                                       u_int32_t dpd_timeout,
+                                                       bool mobike, bool aggressive, bool pull_mode,
+                                                       u_int32_t dpd, u_int32_t dpd_timeout,
                                                        bool mediation, peer_cfg_t *mediated_by,
                                                        identification_t *peer_id);
 

diff --git a/src/libcharon/plugins/ha/ha_tunnel.c b/src/libcharon/plugins/ha/ha_tunnel.c
index 4e656e73b25e600707640c5915973fe88ec5e874..26d152c8f1909753c8b28e1cf0c3915c9c34ea22 100644 (file)
--- a/src/libcharon/plugins/ha/ha_tunnel.c
+++ b/src/libcharon/plugins/ha/ha_tunnel.c
@@ -208,8 +208,8 @@ static void setup_tunnel(private_ha_tunnel_t *this,
                                                         remote, FALSE, IKEV2_UDP_PORT, FRAGMENTATION_NO, 0);
        ike_cfg->add_proposal(ike_cfg, proposal_create_default(PROTO_IKE));
        peer_cfg = peer_cfg_create("ha", ike_cfg, CERT_NEVER_SEND,
-                                               UNIQUE_KEEP, 0, 86400, 0, 7200, 3600, FALSE, FALSE, 30,
-                                               0, FALSE, NULL, NULL);
+                                               UNIQUE_KEEP, 0, 86400, 0, 7200, 3600, FALSE, FALSE,
+                                               TRUE, 30, 0, FALSE, NULL, NULL);
 
        auth_cfg = auth_cfg_create();
        auth_cfg->add(auth_cfg, AUTH_RULE_AUTH_CLASS, AUTH_CLASS_PSK);

diff --git a/src/libcharon/plugins/load_tester/load_tester_config.c b/src/libcharon/plugins/load_tester/load_tester_config.c
index ebadf44ca3175b0ebde7b1c8b173d488d48ed692..26c9871f0b3e9556380cf1558d9c94eef2d0d579 100644 (file)
--- a/src/libcharon/plugins/load_tester/load_tester_config.c
+++ b/src/libcharon/plugins/load_tester/load_tester_config.c
@@ -561,7 +561,7 @@ static peer_cfg_t* generate_config(private_load_tester_config_t *this, uint num)
                                                           CERT_SEND_IF_ASKED, UNIQUE_NO, 1, /* keytries */
                                                           this->ike_rekey, 0, /* rekey, reauth */
                                                           0, this->ike_rekey, /* jitter, overtime */
-                                                          FALSE, FALSE, /* mobike, aggressive mode */
+                                                          FALSE, FALSE, TRUE, /* mobike, aggressive, pull */
                                                           this->dpd_delay,   /* dpd_delay */
                                                           this->dpd_timeout, /* dpd_timeout */
                                                           FALSE, NULL, NULL);

diff --git a/src/libcharon/plugins/maemo/maemo_service.c b/src/libcharon/plugins/maemo/maemo_service.c
index d7539c2da877757a793e964edeab35ebb692259b..f04bc5a4ca5250a7009acfa3ff1d19a905d84aef 100644 (file)
--- a/src/libcharon/plugins/maemo/maemo_service.c
+++ b/src/libcharon/plugins/maemo/maemo_service.c
@@ -334,7 +334,7 @@ static gboolean initiate_connection(private_maemo_service_t *this,
                                                           UNIQUE_REPLACE, 1, /* keyingtries */
                                                           36000, 0, /* rekey 10h, reauth none */
                                                           600, 600, /* jitter, over 10min */
-                                                          TRUE, FALSE, /* mobike, aggressive */
+                                                          TRUE, FALSE, TRUE, /* mobike, aggressive, pull */
                                                           0, 0, /* DPD delay, timeout */
                                                           FALSE, NULL, NULL); /* mediation */
        peer_cfg->add_virtual_ip(peer_cfg,  host_create_from_string("0.0.0.0", 0));

diff --git a/src/libcharon/plugins/medcli/medcli_config.c b/src/libcharon/plugins/medcli/medcli_config.c
index 2bff703077b46d30c54d4018ced909bb40254243..e852e3f476f863b29b6123daa27b192fb123bd93 100644 (file)
--- a/src/libcharon/plugins/medcli/medcli_config.c
+++ b/src/libcharon/plugins/medcli/medcli_config.c
@@ -112,7 +112,7 @@ METHOD(backend_t, get_peer_cfg_by_name, peer_cfg_t*,
                CERT_NEVER_SEND, UNIQUE_REPLACE,
                1, this->rekey*60, 0,                   /* keytries, rekey, reauth */
                this->rekey*5, this->rekey*3,   /* jitter, overtime */
-               TRUE, FALSE,                                    /* mobike, aggressive */
+               TRUE, FALSE, TRUE,                              /* mobike, aggressive, pull */
                this->dpd, 0,                                   /* DPD delay, timeout */
                TRUE, NULL, NULL);                              /* mediation, med by, peer id */
        e->destroy(e);
@@ -149,7 +149,7 @@ METHOD(backend_t, get_peer_cfg_by_name, peer_cfg_t*,
                CERT_NEVER_SEND, UNIQUE_REPLACE,
                1, this->rekey*60, 0,                   /* keytries, rekey, reauth */
                this->rekey*5, this->rekey*3,   /* jitter, overtime */
-               TRUE, FALSE,                                    /* mobike, aggressive */
+               TRUE, FALSE, TRUE,                              /* mobike, aggressive, pull */
                this->dpd, 0,                                   /* DPD delay, timeout */
                FALSE, med_cfg,                                 /* mediation, med by */
                identification_create_from_encoding(ID_KEY_ID, other));
@@ -224,7 +224,7 @@ METHOD(enumerator_t, peer_enumerator_enumerate, bool,
                                CERT_NEVER_SEND, UNIQUE_REPLACE,
                                1, this->rekey*60, 0,                   /* keytries, rekey, reauth */
                                this->rekey*5, this->rekey*3,   /* jitter, overtime */
-                               TRUE, FALSE,                                    /* mobike, aggressive */
+                               TRUE, FALSE, TRUE,                              /* mobike, aggressive, pull */
                                this->dpd, 0,                                   /* DPD delay, timeout */
                                FALSE, NULL, NULL);                             /* mediation, med by, peer id */
 

diff --git a/src/libcharon/plugins/medsrv/medsrv_config.c b/src/libcharon/plugins/medsrv/medsrv_config.c
index 06339220a6177eb891a453f6fc7297dd534287e5..45487a976b378a56823da6ceb1fb2c08e9d6e32f 100644 (file)
--- a/src/libcharon/plugins/medsrv/medsrv_config.c
+++ b/src/libcharon/plugins/medsrv/medsrv_config.c
@@ -92,7 +92,7 @@ METHOD(backend_t, create_peer_cfg_enumerator, enumerator_t*,
                                CERT_NEVER_SEND, UNIQUE_REPLACE,
                                1, this->rekey*60, 0,                   /* keytries, rekey, reauth */
                                this->rekey*5, this->rekey*3,   /* jitter, overtime */
-                               TRUE, FALSE,                                    /* mobike, aggressiv */
+                               TRUE, FALSE, TRUE,                              /* mobike, aggressive, pull */
                                this->dpd, 0,                                   /* DPD delay, timeout */
                                TRUE, NULL, NULL);                              /* mediation, med by, peer id */
                        e->destroy(e);

diff --git a/src/libcharon/plugins/sql/sql_config.c b/src/libcharon/plugins/sql/sql_config.c
index c3471a07862125336478b956efbb5e4fdc0af742..e6b69a4f4dcf8d173335ef57d4bb8baabda48f87 100644 (file)
--- a/src/libcharon/plugins/sql/sql_config.c
+++ b/src/libcharon/plugins/sql/sql_config.c
@@ -374,7 +374,7 @@ static peer_cfg_t *build_peer_cfg(private_sql_config_t *this, enumerator_t *e,
                        peer_cfg = peer_cfg_create(
                                        name, ike, cert_policy, uniqueid,
                                        keyingtries, rekeytime, reauthtime, jitter, overtime,
-                                       mobike, FALSE, dpd_delay, 0,
+                                       mobike, FALSE, TRUE, dpd_delay, 0,
                                        mediation, mediated_cfg, peer_id);
                        if (vip)
                        {

diff --git a/src/libcharon/plugins/stroke/stroke_config.c b/src/libcharon/plugins/stroke/stroke_config.c
index 079e65f1109540eda9d78c8723557503b126e719..facea5e6fdbefa904cd9c1f4731adad18b1c1eeb 100644 (file)
--- 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,
+               TRUE,
                msg->add_conn.dpd.delay, msg->add_conn.dpd.timeout,
                msg->add_conn.ikeme.mediation, mediated_by, peer_id);
 

diff --git a/src/libcharon/plugins/uci/uci_config.c b/src/libcharon/plugins/uci/uci_config.c
index b58d120c18268d33df9983edc00e9411fb214feb..040d8a84fd34f7b9fa71341d31d1418cfa4fb343 100644 (file)
--- a/src/libcharon/plugins/uci/uci_config.c
+++ b/src/libcharon/plugins/uci/uci_config.c
@@ -162,7 +162,7 @@ METHOD(enumerator_t, peer_enumerator_enumerate, bool,
                                        name, ike_cfg, CERT_SEND_IF_ASKED, UNIQUE_NO,
                                        1, create_rekey(ike_rekey), 0,  /* keytries, rekey, reauth */
                                        1800, 900,                                              /* jitter, overtime */
-                                       TRUE, FALSE,                            /* mobike, aggressive */
+                                       TRUE, FALSE, TRUE,                      /* mobike, aggressive, pull */
                                        60, 0,                                          /* DPD delay, timeout */
                                        FALSE, NULL, NULL);                     /* mediation, med by, peer id */
                auth = auth_cfg_create();