start and route connections defined in an SQL database via start_action field and...

diff --git a/src/libcharon/config/child_cfg.c b/src/libcharon/config/child_cfg.c
index e904b44e99d8fdd2b625cbe166c4edddd02c9a95..070b35ababe966b95b35f934942554fb2d38acae 100644 (file)
--- a/src/libcharon/config/child_cfg.c
+++ b/src/libcharon/config/child_cfg.c
@@ -79,6 +79,11 @@ struct private_child_cfg_t {
         */
        ipsec_mode_t mode;
 
+       /**
+        * action to take to start CHILD_SA
+        */
+       action_t start_action;
+
        /**
         * action to take on DPD
         */
@@ -375,6 +380,12 @@ METHOD(child_cfg_t, get_mode, ipsec_mode_t,
        return this->mode;
 }
 
+METHOD(child_cfg_t, get_start_action, action_t,
+       private_child_cfg_t *this)
+{
+       return this->start_action;
+}
+
 METHOD(child_cfg_t, get_dpd_action, action_t,
        private_child_cfg_t *this)
 {
@@ -478,9 +489,9 @@ METHOD(child_cfg_t, destroy, void,
  */
 child_cfg_t *child_cfg_create(char *name, lifetime_cfg_t *lifetime,
                                                          char *updown, bool hostaccess,
-                                                         ipsec_mode_t mode, action_t dpd_action,
-                                                         action_t close_action, bool ipcomp,
-                                                         u_int32_t inactivity, u_int32_t reqid,
+                                                         ipsec_mode_t mode, action_t start_action,
+                                                         action_t dpd_action, action_t close_action,
+                                                         bool ipcomp, u_int32_t inactivity, u_int32_t reqid,
                                                          mark_t *mark_in, mark_t *mark_out)
 {
        private_child_cfg_t *this;
@@ -496,6 +507,7 @@ child_cfg_t *child_cfg_create(char *name, lifetime_cfg_t *lifetime,
                        .get_updown = _get_updown,
                        .get_hostaccess = _get_hostaccess,
                        .get_mode = _get_mode,
+                       .get_start_action = _get_start_action,
                        .get_dpd_action = _get_dpd_action,
                        .get_close_action = _get_close_action,
                        .get_lifetime = _get_lifetime,

diff --git a/src/libcharon/config/child_cfg.h b/src/libcharon/config/child_cfg.h
index 1e6fe3fe919fd6c40c29afc193f0cae7ba880a3f..1f0c9c82615df4087594491a42f18b050b3b1af9 100644 (file)
--- a/src/libcharon/config/child_cfg.h
+++ b/src/libcharon/config/child_cfg.h
@@ -32,14 +32,15 @@ typedef struct child_cfg_t child_cfg_t;
 #include <kernel/kernel_ipsec.h>
 
 /**
- * Action to take when DPD detected/connection gets closed by peer.
+ * Action to take when connection is loaded, DPD is detected or
+ * connection gets closed by peer.
  */
 enum action_t {
        /** No action */
        ACTION_NONE,
-       /** Route config to reestablish on demand */
+       /** Route config to establish or reestablish on demand */
        ACTION_ROUTE,
-       /** Restart config immediately */
+       /** Start or restart config immediately */
        ACTION_RESTART,
 };
 
@@ -168,6 +169,13 @@ struct child_cfg_t {
         */
        ipsec_mode_t (*get_mode) (child_cfg_t *this);
 
+       /**
+        * Action to take to start CHILD_SA.
+        *
+        * @return                              start action
+        */
+       action_t (*get_start_action) (child_cfg_t *this);
+
        /**
         * Action to take on DPD.
         *
@@ -276,6 +284,7 @@ struct child_cfg_t {
  * @param updown                       updown script to execute on up/down event
  * @param hostaccess           TRUE to allow access to the local host
  * @param mode                         mode to propose for CHILD_SA, transport, tunnel or BEET
+ * @param start_action         start action
  * @param dpd_action           DPD action
  * @param close_action         close action
  * @param ipcomp                       use IPComp, if peer supports it
@@ -287,9 +296,9 @@ struct child_cfg_t {
  */
 child_cfg_t *child_cfg_create(char *name, lifetime_cfg_t *lifetime,
                                                          char *updown, bool hostaccess,
-                                                         ipsec_mode_t mode, action_t dpd_action,
-                                                         action_t close_action, bool ipcomp,
-                                                         u_int32_t inactivity, u_int32_t reqid,
+                                                         ipsec_mode_t mode, action_t start_action,
+                                                         action_t dpd_action, action_t close_action,
+                                                         bool ipcomp, u_int32_t inactivity, u_int32_t reqid,
                                                          mark_t *mark_in, mark_t *mark_out);
 
 #endif /** CHILD_CFG_H_ @}*/

diff --git a/src/libcharon/plugins/android/android_service.c b/src/libcharon/plugins/android/android_service.c
index f9a8e1ea1fab8560e90c5ecd56b0346d90948a53..1a68ff968b3a727a55372e65ce2a5007e6c08f41 100644 (file)
--- a/src/libcharon/plugins/android/android_service.c
+++ b/src/libcharon/plugins/android/android_service.c
@@ -291,8 +291,8 @@ static job_requeue_t initiate(private_android_service_t *this)
        peer_cfg->add_auth_cfg(peer_cfg, auth, FALSE);
 
        child_cfg = child_cfg_create("android", &lifetime, NULL, TRUE, MODE_TUNNEL,
-                                                                ACTION_NONE, ACTION_NONE, FALSE, 0, 0,
-                                                                NULL, NULL);
+                                                                ACTION_NONE, ACTION_NONE, ACTION_NONE, FALSE,
+                                                                0, 0, NULL, NULL);
        child_cfg->add_proposal(child_cfg, proposal_create_default(PROTO_ESP));
        ts = traffic_selector_create_dynamic(0, 0, 65535);
        child_cfg->add_traffic_selector(child_cfg, TRUE, ts);

diff --git a/src/libcharon/plugins/ha/ha_tunnel.c b/src/libcharon/plugins/ha/ha_tunnel.c
index fef84a43025e90f3d7d664213bbdad0d4c1beb29..4accdfbf70c5ced46e4e5e13d1ce14f6931e45da 100644 (file)
--- a/src/libcharon/plugins/ha/ha_tunnel.c
+++ b/src/libcharon/plugins/ha/ha_tunnel.c
@@ -223,8 +223,8 @@ static void setup_tunnel(private_ha_tunnel_t *this,
        peer_cfg->add_auth_cfg(peer_cfg, auth_cfg, FALSE);
 
        child_cfg = child_cfg_create("ha", &lifetime, NULL, TRUE, MODE_TRANSPORT,
-                                                                ACTION_NONE, ACTION_NONE, FALSE, 0, 0,
-                                                                NULL, NULL);
+                                                                ACTION_NONE, ACTION_NONE, ACTION_NONE, FALSE,
+                                                                0, 0, NULL, NULL);
        ts = traffic_selector_create_dynamic(IPPROTO_UDP, HA_PORT, HA_PORT);
        child_cfg->add_traffic_selector(child_cfg, TRUE, ts);
        ts = traffic_selector_create_dynamic(IPPROTO_ICMP, 0, 65535);

diff --git a/src/libcharon/plugins/load_tester/load_tester_config.c b/src/libcharon/plugins/load_tester/load_tester_config.c
index a230aa3f584fd46ac64aebe8bc58cc252cba719d..4fe5cf5188cad98d30183e6ec29ff3bab358fc23 100644 (file)
--- a/src/libcharon/plugins/load_tester/load_tester_config.c
+++ b/src/libcharon/plugins/load_tester/load_tester_config.c
@@ -224,8 +224,8 @@ static peer_cfg_t* generate_config(private_load_tester_config_t *this, uint num)
        }
 
        child_cfg = child_cfg_create("load-test", &lifetime, NULL, TRUE, MODE_TUNNEL,
-                                                                ACTION_NONE, ACTION_NONE, FALSE, 0, 0,
-                                                                NULL, NULL);
+                                                                ACTION_NONE, ACTION_NONE, ACTION_NONE, FALSE,
+                                                                0, 0, NULL, NULL);
        proposal = proposal_create_from_string(PROTO_ESP, "aes128-sha1");
        child_cfg->add_proposal(child_cfg, proposal);
        ts = traffic_selector_create_dynamic(0, 0, 65535);

diff --git a/src/libcharon/plugins/maemo/maemo_service.c b/src/libcharon/plugins/maemo/maemo_service.c
index efd914a00b38d9f981315be44836f2881a52e366..8463f8a5618171703d29282927074ea8ab1e4beb 100644 (file)
--- a/src/libcharon/plugins/maemo/maemo_service.c
+++ b/src/libcharon/plugins/maemo/maemo_service.c
@@ -347,7 +347,7 @@ static gboolean initiate_connection(private_maemo_service_t *this,
 
        child_cfg = child_cfg_create(this->current, &lifetime, NULL /* updown */,
                                                                 TRUE, MODE_TUNNEL, ACTION_NONE, ACTION_NONE,
-                                                                FALSE, 0, 0, NULL, NULL);
+                                                                ACTION_NONE, FALSE, 0, 0, NULL, NULL);
        child_cfg->add_proposal(child_cfg, proposal_create_default(PROTO_ESP));
        ts = traffic_selector_create_dynamic(0, 0, 65535);
        child_cfg->add_traffic_selector(child_cfg, TRUE, ts);

diff --git a/src/libcharon/plugins/medcli/medcli_config.c b/src/libcharon/plugins/medcli/medcli_config.c
index 870d87c7e30ddf54a6121a4c5171e116c0a28be4..67f1c7190980ed4c605be3eb4320d39d196bb1da 100644 (file)
--- a/src/libcharon/plugins/medcli/medcli_config.c
+++ b/src/libcharon/plugins/medcli/medcli_config.c
@@ -182,8 +182,8 @@ static peer_cfg_t *get_peer_cfg_by_name(private_medcli_config_t *this, char *nam
        peer_cfg->add_auth_cfg(peer_cfg, auth, FALSE);
 
        child_cfg = child_cfg_create(name, &lifetime, NULL, TRUE, MODE_TUNNEL,
-                                                                ACTION_NONE, ACTION_NONE, FALSE, 0, 0,
-                                                                NULL, NULL);
+                                                                ACTION_NONE, ACTION_NONE, ACTION_NONE, FALSE,
+                                                                0, 0, NULL, NULL);
        child_cfg->add_proposal(child_cfg, proposal_create_default(PROTO_ESP));
        child_cfg->add_traffic_selector(child_cfg, TRUE, ts_from_string(local_net));
        child_cfg->add_traffic_selector(child_cfg, FALSE, ts_from_string(remote_net));
@@ -261,8 +261,8 @@ static bool peer_enumerator_enumerate(peer_enumerator_t *this, peer_cfg_t **cfg)
        this->current->add_auth_cfg(this->current, auth, FALSE);
 
        child_cfg = child_cfg_create(name, &lifetime, NULL, TRUE, MODE_TUNNEL,
-                                                                ACTION_NONE, ACTION_NONE, FALSE, 0, 0,
-                                                                NULL, NULL);
+                                                                ACTION_NONE, ACTION_NONE, ACTION_NONE, FALSE,
+                                                                0, 0, NULL, NULL);
        child_cfg->add_proposal(child_cfg, proposal_create_default(PROTO_ESP));
        child_cfg->add_traffic_selector(child_cfg, TRUE, ts_from_string(local_net));
        child_cfg->add_traffic_selector(child_cfg, FALSE, ts_from_string(remote_net));

diff --git a/src/libcharon/plugins/nm/nm_service.c b/src/libcharon/plugins/nm/nm_service.c
index 72c5bbbb5012141f6818accab4420b4439596703..44b5f0c987677aa01cec79e430464f60e38b3206 100644 (file)
--- a/src/libcharon/plugins/nm/nm_service.c
+++ b/src/libcharon/plugins/nm/nm_service.c
@@ -518,8 +518,8 @@ static gboolean connect_(NMVPNPlugin *plugin, NMConnection *connection,
 
        child_cfg = child_cfg_create(priv->name, &lifetime,
                                                                 NULL, TRUE, MODE_TUNNEL, /* updown, hostaccess */
-                                                                ACTION_NONE, ACTION_NONE, ipcomp, 0, 0,
-                                                                NULL, NULL);
+                                                                ACTION_NONE, ACTION_NONE, ACTION_NONE, ipcomp,
+                                                                0, 0, NULL, NULL);
        child_cfg->add_proposal(child_cfg, proposal_create_default(PROTO_ESP));
        ts = traffic_selector_create_dynamic(0, 0, 65535);
        child_cfg->add_traffic_selector(child_cfg, TRUE, ts);

diff --git a/src/libcharon/plugins/sql/mysql.sql b/src/libcharon/plugins/sql/mysql.sql
index 5a6dd10e9e623cd20a20fe0d455bec2d3f51b897..36bac22c539d0c2853017723afe8912806165575 100644 (file)
--- a/src/libcharon/plugins/sql/mysql.sql
+++ b/src/libcharon/plugins/sql/mysql.sql
@@ -20,6 +20,7 @@ CREATE TABLE `child_configs` (
   `updown` varchar(128) collate utf8_unicode_ci default NULL,
   `hostaccess` tinyint(1) unsigned NOT NULL default '0',
   `mode` tinyint(4) unsigned NOT NULL default '2',
+  `start_action` tinyint(4) unsigned NOT NULL default '0'
   `dpd_action` tinyint(4) unsigned NOT NULL default '0',
   `close_action` tinyint(4) unsigned NOT NULL default '0',
   `ipcomp` tinyint(4) unsigned NOT NULL default '0',

diff --git a/src/libcharon/plugins/sql/sql_config.c b/src/libcharon/plugins/sql/sql_config.c
index a47d93f7b1399a98dda65ddc14490525097d9043..d33bddc7fc4eab141415cbffe4fb2858d228b7d1 100644 (file)
--- a/src/libcharon/plugins/sql/sql_config.c
+++ b/src/libcharon/plugins/sql/sql_config.c
@@ -123,18 +123,19 @@ static void add_traffic_selectors(private_sql_config_t *this,
  */
 static child_cfg_t *build_child_cfg(private_sql_config_t *this, enumerator_t *e)
 {
-       int id, lifetime, rekeytime, jitter, hostaccess, mode, dpd, close, ipcomp;
+       int id, lifetime, rekeytime, jitter, hostaccess, mode, ipcomp;
+       int start, dpd, close;
        char *name, *updown;
        child_cfg_t *child_cfg;
 
-       if (e->enumerate(e, &id, &name, &lifetime, &rekeytime, &jitter,
-                                               &updown, &hostaccess, &mode, &dpd, &close, &ipcomp))
+       if (e->enumerate(e, &id, &name, &lifetime, &rekeytime, &jitter, &updown,
+                                               &hostaccess, &mode, &start, &dpd, &close, &ipcomp))
        {
                lifetime_cfg_t lft = {
                        .time = { .life = lifetime, .rekey = rekeytime, .jitter = jitter }
                };
                child_cfg = child_cfg_create(name, &lft, updown, hostaccess, mode,
-                                                                        dpd, close, ipcomp, 0, 0, NULL, NULL);
+                                                                        start, dpd, close, ipcomp, 0, 0, NULL, NULL);
                /* TODO: read proposal from db */
                child_cfg->add_proposal(child_cfg, proposal_create_default(PROTO_ESP));
                add_traffic_selectors(this, child_cfg, id);
@@ -152,13 +153,13 @@ static void add_child_cfgs(private_sql_config_t *this, peer_cfg_t *peer, int id)
        child_cfg_t *child_cfg;
 
        e = this->db->query(this->db,
-                       "SELECT id, name, lifetime, rekeytime, jitter, "
-                       "updown, hostaccess, mode, dpd_action, close_action, ipcomp "
+                       "SELECT id, name, lifetime, rekeytime, jitter, updown, "
+                       "hostaccess, mode, start_action, dpd_action, close_action, ipcomp "
                        "FROM child_configs JOIN peer_config_child_config ON id = child_cfg "
                        "WHERE peer_cfg = ?",
                        DB_INT, id,
-                       DB_INT, DB_TEXT, DB_INT, DB_INT, DB_INT,
-                       DB_TEXT, DB_INT, DB_INT, DB_INT, DB_INT, DB_INT);
+                       DB_INT, DB_TEXT, DB_INT, DB_INT, DB_INT, DB_TEXT,
+                       DB_INT, DB_INT, DB_INT, DB_INT, DB_INT, DB_INT);
        if (e)
        {
                while ((child_cfg = build_child_cfg(this, e)))

diff --git a/src/libcharon/plugins/sql/sqlite.sql b/src/libcharon/plugins/sql/sqlite.sql
index fcf5a1470e9b91aa03917006c3c96e569f79bfb7..fb5f474b1fb4928a8987ed70618085507b1289bf 100644 (file)
--- a/src/libcharon/plugins/sql/sqlite.sql
+++ b/src/libcharon/plugins/sql/sqlite.sql
@@ -19,6 +19,7 @@ CREATE TABLE child_configs (
   updown TEXT DEFAULT NULL,
   hostaccess INTEGER NOT NULL DEFAULT '0',
   mode INTEGER NOT NULL DEFAULT '2',
+  start_action INTEGER NOT NULL DEFAULT '0',
   dpd_action INTEGER NOT NULL DEFAULT '0',
   close_action INTEGER NOT NULL DEFAULT '0',
   ipcomp INTEGER NOT NULL DEFAULT '0'

diff --git a/src/libcharon/plugins/stroke/stroke_control.c b/src/libcharon/plugins/stroke/stroke_control.c
index 11c1103a2e1cf51549b27adcc9bd183150c2751e..6669f38c06f11faa6d4585f27230a693bb855f34 100644 (file)
--- a/src/libcharon/plugins/stroke/stroke_control.c
+++ b/src/libcharon/plugins/stroke/stroke_control.c
@@ -92,6 +92,59 @@ static child_cfg_t* get_child_from_peer(peer_cfg_t *peer_cfg, char *name)
        return found;
 }
 
+/**
+ * Handles all connections that must be either started or routed
+ * Currently only for connections stored in an SQL database
+ * Connection defined in ipsec.conf are started via stroke commands
+ */
+static void start_all_connections(void)
+{
+       enumerator_t *enumerator, *children;
+       peer_cfg_t *peer_cfg;
+       child_cfg_t *child_cfg;
+       char *name;
+
+       enumerator = charon->backends->create_peer_cfg_enumerator(charon->backends,
+                                                                                                       NULL, NULL, NULL, NULL);
+       while (enumerator->enumerate(enumerator, &peer_cfg))
+       {
+               if (peer_cfg->get_ike_version(peer_cfg) != 2)
+               {
+                       continue;
+               }
+
+               children = peer_cfg->create_child_cfg_enumerator(peer_cfg);
+               while (children->enumerate(children, &child_cfg))
+               {
+                       name = child_cfg->get_name(child_cfg);
+
+                       switch (child_cfg->get_start_action(child_cfg))
+                       {
+                               case ACTION_RESTART:
+                                       charon->controller->initiate(charon->controller,
+                                                                                                peer_cfg->get_ref(peer_cfg),
+                                                                                                child_cfg->get_ref(child_cfg),
+                                                                                                NULL, NULL);
+                                       break;
+                               case ACTION_ROUTE:
+                                       if (charon->traps->install(charon->traps, peer_cfg, child_cfg))
+                                       {
+                                               DBG1(DBG_CFG, "configuration '%s' routed", name);
+                                       }
+                                       else
+                                       {
+                                               DBG1(DBG_CFG, "routing configuration '%s' failed", name);
+                                       }
+                                       break;
+                               case ACTION_NONE:
+                                       break;
+                       }
+               }
+               children->destroy(children);
+       }
+       enumerator->destroy(enumerator);
+}
+
 /**
  * Implementation of stroke_control_t.initiate.
  */
@@ -101,6 +154,12 @@ static void initiate(private_stroke_control_t *this, stroke_msg_t *msg, FILE *ou
        child_cfg_t *child_cfg;
        stroke_log_info_t info;
 
+       if (streq(msg->initiate.name, "%startall"))
+       {
+               start_all_connections();
+               return;
+       }
+
        peer_cfg = charon->backends->get_peer_cfg_by_name(charon->backends,
                                                                                                          msg->initiate.name);
        if (peer_cfg == NULL)

diff --git a/src/libcharon/plugins/uci/uci_config.c b/src/libcharon/plugins/uci/uci_config.c
index ddddae78257664ab2348ae18401cf6447851375a..f16da22bcfda7f37b2fbf1c803b28756a906070d 100644 (file)
--- a/src/libcharon/plugins/uci/uci_config.c
+++ b/src/libcharon/plugins/uci/uci_config.c
@@ -196,8 +196,8 @@ static bool peer_enumerator_enumerate(peer_enumerator_t *this, peer_cfg_t **cfg)
                this->peer_cfg->add_auth_cfg(this->peer_cfg, auth, FALSE);
 
                child_cfg = child_cfg_create(name, &lifetime, NULL, TRUE, MODE_TUNNEL,
-                                                                        ACTION_NONE, ACTION_NONE, FALSE, 0, 0,
-                                                                        NULL, NULL);
+                                                                        ACTION_NONE, ACTION_NONE, ACTION_NONE,
+                                                                        FALSE, 0, 0, NULL, NULL);
                child_cfg->add_proposal(child_cfg, create_proposal(esp_proposal, PROTO_ESP));
                child_cfg->add_traffic_selector(child_cfg, TRUE, create_ts(local_net));
                child_cfg->add_traffic_selector(child_cfg, FALSE, create_ts(remote_net));

diff --git a/testing/hosts/default/etc/ipsec.d/tables.sql b/testing/hosts/default/etc/ipsec.d/tables.sql
index eb41533cb0aa40e20e5a555005c152e7d34d75c9..a4ae7227029dcb7b9e986f89386e54f25161ef88 100644 (file)
--- a/testing/hosts/default/etc/ipsec.d/tables.sql
+++ b/testing/hosts/default/etc/ipsec.d/tables.sql
@@ -18,6 +18,7 @@ CREATE TABLE child_configs (
   updown TEXT DEFAULT NULL,
   hostaccess INTEGER NOT NULL DEFAULT '0',
   mode INTEGER NOT NULL DEFAULT '2',
+  start_action INTEGER NOT NULL DEFAULT '0',
   dpd_action INTEGER NOT NULL DEFAULT '0',
   close_action INTEGER NOT NULL DEFAULT '0',
   ipcomp INTEGER NOT NULL DEFAULT '0'