Handling of new lifetime limits added to stroke.

diff --git a/src/charon/config/child_cfg.h b/src/charon/config/child_cfg.h
index 7bae8d9a6858f19a62f084de43aa3c59535051f1..ce6a23629ca45bc44250a2b2484591111406fe44 100644 (file)
--- a/src/charon/config/child_cfg.h
+++ b/src/charon/config/child_cfg.h
@@ -92,6 +92,16 @@ struct lifetime_cfg_t {
        u_int64_t       jitter_packets;
 };
 
+/**
+ * Helper macro to easily set all three values of a specified limit (time,
+ * bytes, packets).
+ */
+#define LIFETIME_CFG_SET(l, limit, life, rekey, jitter) do { \
+       (l)->life_##limit = (life); \
+       (l)->rekey_##limit = (rekey); \
+       (l)->jitter_##limit = (jitter); \
+} while(0)
+
 /**
  * Create a new lifetime_cfg_t object.
  */
@@ -108,9 +118,7 @@ static inline lifetime_cfg_t* lifetime_cfg_create_time(u_int64_t life,
                                                                          u_int64_t rekey, u_int64_t jitter)
 {
        lifetime_cfg_t *this = lifetime_cfg_create();
-       this->life_time = life;
-       this->rekey_time = rekey;
-       this->jitter_time = jitter;
+       LIFETIME_CFG_SET(this, time, life, rekey, jitter);
        return this;
 }
 

diff --git a/src/charon/plugins/stroke/stroke_config.c b/src/charon/plugins/stroke/stroke_config.c
index 5a4dfe264c52dc22fe3d37c1ca9e4b8003aa5024..c76fd16226713fc12fbd0104ddeada1f1fc70cb1 100644 (file)
--- a/src/charon/plugins/stroke/stroke_config.c
+++ b/src/charon/plugins/stroke/stroke_config.c
@@ -772,6 +772,14 @@ static child_cfg_t *build_child_cfg(private_stroke_config_t *this,
                                msg->add_conn.rekey.ipsec_lifetime,
                                msg->add_conn.rekey.ipsec_lifetime - msg->add_conn.rekey.margin,
                                msg->add_conn.rekey.margin * msg->add_conn.rekey.fuzz / 100);
+       LIFETIME_CFG_SET(lifetime, bytes,
+               msg->add_conn.rekey.life_bytes,
+               msg->add_conn.rekey.life_bytes - msg->add_conn.rekey.margin_bytes,
+               msg->add_conn.rekey.margin_bytes * msg->add_conn.rekey.fuzz / 100);
+       LIFETIME_CFG_SET(lifetime, packets,
+               msg->add_conn.rekey.life_packets,
+               msg->add_conn.rekey.life_packets - msg->add_conn.rekey.margin_packets,
+               msg->add_conn.rekey.margin_packets * msg->add_conn.rekey.fuzz / 100);
        
        child_cfg = child_cfg_create(
                                msg->add_conn.name, lifetime,

diff --git a/src/starter/starterstroke.c b/src/starter/starterstroke.c
index 578c52ee1c33ddc7d8b62e325be3d264ba87a66b..96caff8cb719d6aa36abb4d74a78025690cdf825 100644 (file)
--- a/src/starter/starterstroke.c
+++ b/src/starter/starterstroke.c
@@ -279,6 +279,10 @@ int starter_stroke_add_conn(starter_config_t *cfg, starter_conn_t *conn)
                msg.add_conn.rekey.ipsec_lifetime = conn->sa_ipsec_life_seconds;
                msg.add_conn.rekey.ike_lifetime = conn->sa_ike_life_seconds;
                msg.add_conn.rekey.margin = conn->sa_rekey_margin;
+               msg.add_conn.rekey.life_bytes = conn->sa_ipsec_life_bytes;
+               msg.add_conn.rekey.margin_bytes = conn->sa_ipsec_margin_bytes;
+               msg.add_conn.rekey.life_packets = conn->sa_ipsec_life_packets;
+               msg.add_conn.rekey.margin_packets = conn->sa_ipsec_margin_packets;
                msg.add_conn.rekey.tries = conn->sa_keying_tries;
                msg.add_conn.rekey.fuzz = conn->sa_rekey_fuzz;
        }

diff --git a/src/stroke/stroke_msg.h b/src/stroke/stroke_msg.h
index abf285a867885d57cf24abde80f43eddd94ea45b..9c3041c3854a0fce70c9b258d0ff134c3e1453f6 100644 (file)
--- a/src/stroke/stroke_msg.h
+++ b/src/stroke/stroke_msg.h
@@ -237,6 +237,10 @@ struct stroke_msg_t {
                                time_t ipsec_lifetime;
                                time_t ike_lifetime;
                                time_t margin;
+                               u_int64_t life_bytes;
+                               u_int64_t margin_bytes;
+                               u_int64_t life_packets;
+                               u_int64_t margin_packets;
                                unsigned long tries;
                                unsigned long fuzz;
                        } rekey;