denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mediation extension adapted to the naming convention of the current version of the draft. note: the external interface (config, autotools) has not yet been changed

Browse Source
This commit is contained in:
Tobias Brunner
2008-03-26 18:40:19 +00:00
parent 685232670a
commit dc04b7c743
47 changed files with 522 additions and 522 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/starter/args.c
+3 -3
View File
@@ -210,9 +210,9 @@ static const token_info_t token_info[] =
{ ARG_ENUM, offsetof(starter_conn_t, dpd_action), LST_dpd_action },
{ ARG_MISC, 0, NULL /* KW_MODECONFIG */ },
{ ARG_MISC, 0, NULL /* KW_XAUTH */ },
{ ARG_ENUM, offsetof(starter_conn_t, p2p_mediation), LST_bool },
{ ARG_STR, offsetof(starter_conn_t, p2p_mediated_by), NULL },
{ ARG_STR, offsetof(starter_conn_t, p2p_peerid), NULL },
{ ARG_ENUM, offsetof(starter_conn_t, me_mediation), LST_bool },
{ ARG_STR, offsetof(starter_conn_t, me_mediated_by), NULL },
{ ARG_STR, offsetof(starter_conn_t, me_peerid), NULL },
/* ca section keywords */
{ ARG_STR, offsetof(starter_ca_t, name), NULL },
src/starter/confread.h
+3 -3
View File
@@ -130,9 +130,9 @@ struct starter_conn {
dpd_action_t dpd_action;
int dpd_count;
bool p2p_mediation;
char *p2p_mediated_by;
char *p2p_peerid;
bool me_mediation;
char *me_mediated_by;
char *me_peerid;
starter_conn_t *next;
};
src/starter/keywords.h
+4 -4
View File
@@ -87,12 +87,12 @@ typedef enum {
KW_DPDACTION,
KW_MODECONFIG,
KW_XAUTH,
KW_P2P_MEDIATION,
KW_P2P_MEDIATED_BY,
KW_P2P_PEERID,
KW_ME_MEDIATION,
KW_ME_MEDIATED_BY,
KW_ME_PEERID,
#define KW_CONN_FIRST KW_CONN_SETUP
#define KW_CONN_LAST KW_P2P_PEERID
#define KW_CONN_LAST KW_ME_PEERID
/* ca section keywords */
KW_CA_NAME,
src/starter/keywords.txt
+3 -3
View File
@@ -76,9 +76,9 @@ dpdtimeout, KW_DPDTIMEOUT
dpdaction, KW_DPDACTION
modeconfig, KW_MODECONFIG
xauth, KW_XAUTH
p2p_mediation, KW_P2P_MEDIATION
p2p_mediated_by, KW_P2P_MEDIATED_BY
p2p_peerid, KW_P2P_PEERID
p2p_mediation, KW_ME_MEDIATION
p2p_mediated_by, KW_ME_MEDIATED_BY
p2p_peerid, KW_ME_PEERID
cacert, KW_CACERT
ldaphost, KW_LDAPHOST
ldapbase, KW_LDAPBASE
src/starter/starterstroke.c
+3 -3
View File
@@ -237,9 +237,9 @@ int starter_stroke_add_conn(starter_config_t *cfg, starter_conn_t *conn)
msg.add_conn.algorithms.esp = push_string(&msg, conn->esp);
msg.add_conn.dpd.delay = conn->dpd_delay;
msg.add_conn.dpd.action = conn->dpd_action;
msg.add_conn.p2p.mediation = conn->p2p_mediation;
msg.add_conn.p2p.mediated_by = push_string(&msg, conn->p2p_mediated_by);
msg.add_conn.p2p.peerid = push_string(&msg, conn->p2p_peerid);
msg.add_conn.ikeme.mediation = conn->me_mediation;
msg.add_conn.ikeme.mediated_by = push_string(&msg, conn->me_mediated_by);
msg.add_conn.ikeme.peerid = push_string(&msg, conn->me_peerid);
starter_stroke_add_end(&msg, &msg.add_conn.me, &conn->left);
starter_stroke_add_end(&msg, &msg.add_conn.other, &conn->right);