diff options
| author | Martin Willi <martin@revosec.ch> | 2013-06-20 16:08:23 +0200 |
|---|---|---|
| committer | Martin Willi <martin@revosec.ch> | 2013-10-11 10:15:20 +0200 |
| commit | a07b97e8042752c7b1b85828dc2bfcf60d49a0da (patch) | |
| tree | d1f22d5a4760a32da709480cd72ceb549c279d51 /src | |
| parent | 4524e128f845f8842cdf9ffecf4c1978218212cb (diff) | |
| download | strongswan-a07b97e8042752c7b1b85828dc2bfcf60d49a0da.tar.bz2 strongswan-a07b97e8042752c7b1b85828dc2bfcf60d49a0da.tar.xz | |
starter: Add an 'ah' keyword for Authentication Header Security Associations
Diffstat (limited to 'src')
| -rw-r--r-- | src/starter/args.c | 1 | ||||
| -rw-r--r-- | src/starter/confread.h | 1 | ||||
| -rw-r--r-- | src/starter/keywords.h | 1 | ||||
| -rw-r--r-- | src/starter/keywords.txt | 1 | ||||
| -rw-r--r-- | src/starter/starterstroke.c | 1 | ||||
| -rw-r--r-- | src/stroke/stroke_msg.h | 1 |
6 files changed, 6 insertions, 0 deletions
diff --git a/src/starter/args.c b/src/starter/args.c index 5fbf51856..9672c66db 100644 --- 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 0690bed4e..27e6fcdd9 100644 --- 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 83ce4a7dd..32815e2f6 100644 --- 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 20d35ded0..eb977f5f8 100644 --- 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 bf7e0284f..fca4b1e7d 100644 --- 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 6c8dcf5f9..5ece7248b 100644 --- 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; |