Added a "aggressive" ipsec.conf connection option

diff --git a/src/libcharon/plugins/stroke/stroke_config.c b/src/libcharon/plugins/stroke/stroke_config.c
index e39233b7eed08c15b6572797faa831bd715ff065..bc2518a08496fa5635e07add3d25e8962568131b 100644 (file)
--- a/src/libcharon/plugins/stroke/stroke_config.c
+++ b/src/libcharon/plugins/stroke/stroke_config.c
@@ -689,7 +689,7 @@ static peer_cfg_t *build_peer_cfg(private_stroke_config_t *this,
                msg->add_conn.version, ike_cfg,
                msg->add_conn.me.sendcert, unique,
                msg->add_conn.rekey.tries, rekey, reauth, jitter, over,
-               msg->add_conn.mobike, FALSE, msg->add_conn.dpd.delay,
+               msg->add_conn.mobike, msg->add_conn.aggressive, msg->add_conn.dpd.delay,
                vip, msg->add_conn.other.sourceip_mask ?
                                                        msg->add_conn.name : msg->add_conn.other.sourceip,
                msg->add_conn.ikeme.mediation, mediated_by, peer_id);

diff --git a/src/starter/args.c b/src/starter/args.c
index 65d0a753ca509369ec113cf006b9a9784f616341..88133dd53889226bbfe153d9ab6eee61240e20b1 100644 (file)
--- a/src/starter/args.c
+++ b/src/starter/args.c
@@ -204,6 +204,7 @@ static const token_info_t token_info[] =
        { ARG_MISC, 0, NULL  /* KW_PFS */                                              },
        { ARG_MISC, 0, NULL  /* KW_COMPRESS */                                         },
        { ARG_ENUM, offsetof(starter_conn_t, install_policy), LST_bool                 },
+       { ARG_ENUM, offsetof(starter_conn_t, aggressive), LST_bool                     },
        { ARG_MISC, 0, NULL  /* KW_AUTH */                                             },
        { ARG_MISC, 0, NULL  /* KW_AUTHBY */                                           },
        { ARG_MISC, 0, NULL  /* KW_EAP */                                              },

diff --git a/src/starter/confread.h b/src/starter/confread.h
index 47bd846033ad2af2159a77b53faae13d14c873d4..25f37e6330793aa07428f9564d3f83dace7f9e77 100644 (file)
--- a/src/starter/confread.h
+++ b/src/starter/confread.h
@@ -132,6 +132,7 @@ struct starter_conn {
                sa_family_t     addr_family;
                sa_family_t     tunnel_addr_family;
                bool            install_policy;
+               bool            aggressive;
                starter_end_t   left, right;
 
                unsigned long   id;

diff --git a/src/starter/keywords.h b/src/starter/keywords.h
index 02be919ead42e2d16466b02c353224e413470c67..71e31e9f51b540b982545faa81565a1f05005e0b 100644 (file)
--- a/src/starter/keywords.h
+++ b/src/starter/keywords.h
@@ -67,6 +67,7 @@ typedef enum {
        KW_PFS,
        KW_COMPRESS,
        KW_INSTALLPOLICY,
+       KW_AGGRESSIVE,
        KW_AUTH,
        KW_AUTHBY,
        KW_EAP,

diff --git a/src/starter/keywords.txt b/src/starter/keywords.txt
index 548fa2f70e00373525a6909ca35a7112ff60bb4f..bd1f9304cf38aaf44fae5534e3caf28e12efc650 100644 (file)
--- a/src/starter/keywords.txt
+++ b/src/starter/keywords.txt
@@ -61,6 +61,7 @@ type,              KW_TYPE
 pfs,               KW_PFS
 compress,          KW_COMPRESS
 installpolicy,     KW_INSTALLPOLICY
+aggressive,        KW_AGGRESSIVE
 auth,              KW_AUTH
 authby,            KW_AUTHBY
 keylife,           KW_KEYLIFE

diff --git a/src/starter/starterstroke.c b/src/starter/starterstroke.c
index c4d9fa2e97c2a3d69730c05c7e2efcf165683fe6..9fbfffc8342f9140d563769f69e6dbc7b9ce8983 100644 (file)
--- a/src/starter/starterstroke.c
+++ b/src/starter/starterstroke.c
@@ -265,6 +265,7 @@ int starter_stroke_add_conn(starter_config_t *cfg, starter_conn_t *conn)
        msg.add_conn.force_encap = (conn->policy & POLICY_FORCE_ENCAP) != 0;
        msg.add_conn.ipcomp = (conn->policy & POLICY_COMPRESS) != 0;
        msg.add_conn.install_policy = conn->install_policy;
+       msg.add_conn.aggressive = conn->aggressive;
        msg.add_conn.crl_policy = 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 af566b952a68332cd4bfd90f6f8b3a79cd4b7a1a..825228e9d151c5c190d9c029f3770f66be532475 100644 (file)
--- a/src/stroke/stroke_msg.h
+++ b/src/stroke/stroke_msg.h
@@ -249,6 +249,7 @@ struct stroke_msg_t {
                        char *xauth_identity;
                        int mode;
                        int mobike;
+                       int aggressive;
                        int force_encap;
                        int ipcomp;
                        time_t inactivity;