Added keywords for the new lifetime limits to starter.

diff --git a/src/starter/args.c b/src/starter/args.c
index f6d8cef..f01f3e9 100644 (file)
--- a/src/starter/args.c
+++ b/src/starter/args.c
@@ -208,6 +208,10 @@ static const token_info_t token_info[] =
        { ARG_TIME, offsetof(starter_conn_t, sa_ike_life_seconds), NULL                },
        { ARG_TIME, offsetof(starter_conn_t, sa_ipsec_life_seconds), NULL              },
        { ARG_TIME, offsetof(starter_conn_t, sa_rekey_margin), NULL                    },
+       { ARG_ULLI, offsetof(starter_conn_t, sa_ipsec_life_bytes), NULL                },
+       { ARG_ULLI, offsetof(starter_conn_t, sa_ipsec_margin_bytes), NULL              },
+       { ARG_ULLI, offsetof(starter_conn_t, sa_ipsec_life_packets), NULL              },
+       { ARG_ULLI, offsetof(starter_conn_t, sa_ipsec_margin_packets), NULL            },
        { ARG_MISC, 0, NULL  /* KW_KEYINGTRIES */                                      },
        { ARG_PCNT, offsetof(starter_conn_t, sa_rekey_fuzz), NULL                      },
        { ARG_MISC, 0, NULL  /* KW_REKEY */                                            },

diff --git a/src/starter/confread.h b/src/starter/confread.h
index b20c2e0..2f789e9 100644 (file)
--- a/src/starter/confread.h
+++ b/src/starter/confread.h
@@ -112,6 +112,10 @@ struct starter_conn {
                time_t          sa_ike_life_seconds;
                time_t          sa_ipsec_life_seconds;
                time_t          sa_rekey_margin;
+               u_int64_t       sa_ipsec_life_bytes;
+               u_int64_t       sa_ipsec_margin_bytes;
+               u_int64_t       sa_ipsec_life_packets;
+               u_int64_t       sa_ipsec_margin_packets;
                unsigned long   sa_keying_tries;
                unsigned long   sa_rekey_fuzz;
                sa_family_t     addr_family;

diff --git a/src/starter/keywords.h b/src/starter/keywords.h
index 3a115d1..68f3207 100644 (file)
--- a/src/starter/keywords.h
+++ b/src/starter/keywords.h
@@ -66,7 +66,7 @@ typedef enum {
        KW_TYPE,
        KW_PFS,
        KW_COMPRESS,
-               KW_INSTALLPOLICY,
+       KW_INSTALLPOLICY,
        KW_AUTH,
        KW_AUTHBY,
        KW_EAP,
@@ -76,6 +76,10 @@ typedef enum {
        KW_IKELIFETIME,
        KW_KEYLIFE,
        KW_REKEYMARGIN,
+       KW_LIFEBYTES,
+       KW_MARGINBYTES,
+       KW_LIFEPACKETS,
+       KW_MARGINPACKETS,
        KW_KEYINGTRIES,
        KW_REKEYFUZZ,
        KW_REKEY,

diff --git a/src/starter/keywords.txt b/src/starter/keywords.txt
index 66c8948..d95c5c2 100644 (file)
--- a/src/starter/keywords.txt
+++ b/src/starter/keywords.txt
@@ -64,6 +64,10 @@ auth,              KW_AUTH
 authby,            KW_AUTHBY
 keylife,           KW_KEYLIFE
 rekeymargin,       KW_REKEYMARGIN
+lifebytes,         KW_LIFEBYTES
+marginbytes,       KW_MARGINBYTES
+lifepackets,       KW_LIFEPACKETS
+marginpackets,     KW_MARGINPACKETS
 ikelifetime,       KW_IKELIFETIME
 keyingtries,       KW_KEYINGTRIES
 rekeyfuzz,         KW_REKEYFUZZ