starter: Add an 'ah' keyword for Authentication Header Security Associations
authorMartin Willi <martin@revosec.ch>
Thu, 20 Jun 2013 14:08:23 +0000 (16:08 +0200)
committerMartin Willi <martin@revosec.ch>
Fri, 11 Oct 2013 08:15:20 +0000 (10:15 +0200)
src/starter/args.c
src/starter/confread.h
src/starter/keywords.h
src/starter/keywords.txt
src/starter/starterstroke.c
src/stroke/stroke_msg.h

index 5fbf518..9672c66 100644 (file)
@@ -161,6 +161,7 @@ static const token_info_t token_info[] =
        { ARG_MISC, 0, NULL  /* KW_REAUTH */                                           },
        { ARG_STR,  offsetof(starter_conn_t, ike), NULL                                },
        { ARG_STR,  offsetof(starter_conn_t, esp), NULL                                },
+       { ARG_STR,  offsetof(starter_conn_t, ah), NULL                                 },
        { ARG_TIME, offsetof(starter_conn_t, dpd_delay), NULL                          },
        { ARG_TIME, offsetof(starter_conn_t, dpd_timeout), NULL                        },
        { ARG_ENUM, offsetof(starter_conn_t, dpd_action), LST_dpd_action               },
index 0690bed..27e6fcd 100644 (file)
@@ -171,6 +171,7 @@ struct starter_conn {
                unsigned long   id;
 
                char            *esp;
+               char            *ah;
                char            *ike;
 
                time_t          dpd_delay;
index 83ce4a7..32815e2 100644 (file)
@@ -57,6 +57,7 @@ typedef enum {
        KW_REAUTH,
        KW_IKE,
        KW_ESP,
+       KW_AH,
        KW_DPDDELAY,
        KW_DPDTIMEOUT,
        KW_DPDACTION,
index 20d35de..eb977f5 100644 (file)
@@ -57,6 +57,7 @@ rekey,             KW_REKEY
 reauth,            KW_REAUTH
 ike,               KW_IKE
 esp,               KW_ESP
+ah,                KW_AH
 dpddelay,          KW_DPDDELAY
 dpdtimeout,        KW_DPDTIMEOUT
 dpdaction,         KW_DPDACTION
index bf7e028..fca4b1e 100644 (file)
@@ -192,6 +192,7 @@ int starter_stroke_add_conn(starter_config_t *cfg, starter_conn_t *conn)
        msg.add_conn.unique = cfg->setup.uniqueids;
        msg.add_conn.algorithms.ike = push_string(&msg, conn->ike);
        msg.add_conn.algorithms.esp = push_string(&msg, conn->esp);
+       msg.add_conn.algorithms.ah = push_string(&msg, conn->ah);
        msg.add_conn.dpd.delay = conn->dpd_delay;
        msg.add_conn.dpd.timeout = conn->dpd_timeout;
        msg.add_conn.dpd.action = conn->dpd_action;
index 6c8dcf5..5ece724 100644 (file)
@@ -275,6 +275,7 @@ struct stroke_msg_t {
                        struct {
                                char *ike;
                                char *esp;
+                               char *ah;
                        } algorithms;
                        struct {
                                int reauth;