starter: Add an 'ah' keyword for Authentication Header Security Associations
This commit is contained in:
@@ -161,6 +161,7 @@ static const token_info_t token_info[] =
|
|||||||
{ ARG_MISC, 0, NULL /* KW_REAUTH */ },
|
{ ARG_MISC, 0, NULL /* KW_REAUTH */ },
|
||||||
{ ARG_STR, offsetof(starter_conn_t, ike), NULL },
|
{ ARG_STR, offsetof(starter_conn_t, ike), NULL },
|
||||||
{ ARG_STR, offsetof(starter_conn_t, esp), 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_delay), NULL },
|
||||||
{ ARG_TIME, offsetof(starter_conn_t, dpd_timeout), NULL },
|
{ ARG_TIME, offsetof(starter_conn_t, dpd_timeout), NULL },
|
||||||
{ ARG_ENUM, offsetof(starter_conn_t, dpd_action), LST_dpd_action },
|
{ ARG_ENUM, offsetof(starter_conn_t, dpd_action), LST_dpd_action },
|
||||||
|
|||||||
@@ -171,6 +171,7 @@ struct starter_conn {
|
|||||||
unsigned long id;
|
unsigned long id;
|
||||||
|
|
||||||
char *esp;
|
char *esp;
|
||||||
|
char *ah;
|
||||||
char *ike;
|
char *ike;
|
||||||
|
|
||||||
time_t dpd_delay;
|
time_t dpd_delay;
|
||||||
|
|||||||
@@ -57,6 +57,7 @@ typedef enum {
|
|||||||
KW_REAUTH,
|
KW_REAUTH,
|
||||||
KW_IKE,
|
KW_IKE,
|
||||||
KW_ESP,
|
KW_ESP,
|
||||||
|
KW_AH,
|
||||||
KW_DPDDELAY,
|
KW_DPDDELAY,
|
||||||
KW_DPDTIMEOUT,
|
KW_DPDTIMEOUT,
|
||||||
KW_DPDACTION,
|
KW_DPDACTION,
|
||||||
|
|||||||
@@ -57,6 +57,7 @@ rekey, KW_REKEY
|
|||||||
reauth, KW_REAUTH
|
reauth, KW_REAUTH
|
||||||
ike, KW_IKE
|
ike, KW_IKE
|
||||||
esp, KW_ESP
|
esp, KW_ESP
|
||||||
|
ah, KW_AH
|
||||||
dpddelay, KW_DPDDELAY
|
dpddelay, KW_DPDDELAY
|
||||||
dpdtimeout, KW_DPDTIMEOUT
|
dpdtimeout, KW_DPDTIMEOUT
|
||||||
dpdaction, KW_DPDACTION
|
dpdaction, KW_DPDACTION
|
||||||
|
|||||||
@@ -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.unique = cfg->setup.uniqueids;
|
||||||
msg.add_conn.algorithms.ike = push_string(&msg, conn->ike);
|
msg.add_conn.algorithms.ike = push_string(&msg, conn->ike);
|
||||||
msg.add_conn.algorithms.esp = push_string(&msg, conn->esp);
|
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.delay = conn->dpd_delay;
|
||||||
msg.add_conn.dpd.timeout = conn->dpd_timeout;
|
msg.add_conn.dpd.timeout = conn->dpd_timeout;
|
||||||
msg.add_conn.dpd.action = conn->dpd_action;
|
msg.add_conn.dpd.action = conn->dpd_action;
|
||||||
|
|||||||
@@ -275,6 +275,7 @@ struct stroke_msg_t {
|
|||||||
struct {
|
struct {
|
||||||
char *ike;
|
char *ike;
|
||||||
char *esp;
|
char *esp;
|
||||||
|
char *ah;
|
||||||
} algorithms;
|
} algorithms;
|
||||||
struct {
|
struct {
|
||||||
int reauth;
|
int reauth;
|
||||||
|
|||||||
Reference in New Issue
Block a user