starter: Add an 'ah' keyword for Authentication Header Security Associations

diff --git a/src/starter/args.c b/src/starter/args.c
index 5fbf51856bc7e5ee38eecb8a25adc681df535bb6..9672c66db07a6b45d6cc89d4a873ef80564ca0a9 100644 (file)
--- a/src/starter/args.c
+++ b/src/starter/args.c
@@ -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               },

diff --git a/src/starter/confread.h b/src/starter/confread.h
index 0690bed4e4fa80faafa35d078bddda226a7d36fe..27e6fcdd9758bf9d12719cccb032254492921a34 100644 (file)
--- a/src/starter/confread.h
+++ b/src/starter/confread.h
@@ -171,6 +171,7 @@ struct starter_conn {
                unsigned long   id;
 
                char            *esp;
+               char            *ah;
                char            *ike;
 
                time_t          dpd_delay;

diff --git a/src/starter/keywords.h b/src/starter/keywords.h
index 83ce4a7ddfca1ebb6b7f2e3af899458840ce6667..32815e2f6cc6d0f6180d36195027b871a75fc6fa 100644 (file)
--- a/src/starter/keywords.h
+++ b/src/starter/keywords.h
@@ -57,6 +57,7 @@ typedef enum {
        KW_REAUTH,
        KW_IKE,
        KW_ESP,
+       KW_AH,
        KW_DPDDELAY,
        KW_DPDTIMEOUT,
        KW_DPDACTION,

diff --git a/src/starter/keywords.txt b/src/starter/keywords.txt
index 20d35ded06f70194387949906f81627fff935f11..eb977f5f8c5d4d8a7aa70242a3a1a43320e00d68 100644 (file)
--- a/src/starter/keywords.txt
+++ b/src/starter/keywords.txt
@@ -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

diff --git a/src/starter/starterstroke.c b/src/starter/starterstroke.c
index bf7e0284fd99df0d312f59ae88b7e009c1dc5ef5..fca4b1e7dca927f4e8a08c9480709177c2fa7d9c 100644 (file)
--- a/src/starter/starterstroke.c
+++ b/src/starter/starterstroke.c
@@ -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;

diff --git a/src/stroke/stroke_msg.h b/src/stroke/stroke_msg.h
index 6c8dcf5f93f9b2d00bda159f1d67032842fcddba..5ece7248bf76328b7cd90196bd24f17a7a11e3b3 100644 (file)
--- a/src/stroke/stroke_msg.h
+++ b/src/stroke/stroke_msg.h
@@ -275,6 +275,7 @@ struct stroke_msg_t {
                        struct {
                                char *ike;
                                char *esp;
+                               char *ah;
                        } algorithms;
                        struct {
                                int reauth;