diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/charon/plugins/stroke/stroke_socket.c | 6 | ||||
| -rw-r--r-- | src/starter/ipsec.conf.5 | 18 | ||||
| -rw-r--r-- | src/starter/keywords.h | 4 | ||||
| -rw-r--r-- | src/starter/keywords.txt | 6 |
4 files changed, 17 insertions, 17 deletions
diff --git a/src/charon/plugins/stroke/stroke_socket.c b/src/charon/plugins/stroke/stroke_socket.c index ce0725196..8ce757acb 100644 --- a/src/charon/plugins/stroke/stroke_socket.c +++ b/src/charon/plugins/stroke/stroke_socket.c @@ -168,9 +168,9 @@ static void stroke_add_conn(private_stroke_socket_t *this, stroke_msg_t *msg) DBG2(DBG_CFG, " esp=%s", msg->add_conn.algorithms.esp); pop_string(msg, &msg->add_conn.ikeme.mediated_by); pop_string(msg, &msg->add_conn.ikeme.peerid); - DBG2(DBG_CFG, " p2p_mediation=%s", msg->add_conn.ikeme.mediation ? "yes" : "no"); - DBG2(DBG_CFG, " p2p_mediated_by=%s", msg->add_conn.ikeme.mediated_by); - DBG2(DBG_CFG, " p2p_peerid=%s", msg->add_conn.ikeme.peerid); + DBG2(DBG_CFG, " mediation=%s", msg->add_conn.ikeme.mediation ? "yes" : "no"); + DBG2(DBG_CFG, " mediated_by=%s", msg->add_conn.ikeme.mediated_by); + DBG2(DBG_CFG, " me_peerid=%s", msg->add_conn.ikeme.peerid); this->config->add(this->config, msg); } diff --git a/src/starter/ipsec.conf.5 b/src/starter/ipsec.conf.5 index 56032c766..bb108ca63 100644 --- a/src/starter/ipsec.conf.5 +++ b/src/starter/ipsec.conf.5 @@ -788,31 +788,31 @@ and .B client (the default). -.SS "CONN PARAMETERS: PEER-TO-PEER" -The following parameters are relevant to Peer-to-Peer NAT-T operation -only. +.SS "CONN PARAMETERS: IKEv2 MEDIATION EXTENSION" +The following parameters are relevant to IKEv2 Mediation Extension +operation only. .TP 14 -.B p2p_mediation -whether this connection is a P2P mediation connection, ie. whether this +.B mediation +whether this connection is a mediation connection, ie. whether this connection is used to mediate other connections. Mediation connections create no child SA. Acceptable values are .B no (the default) and .BR yes . .TP -.B p2p_mediated_by +.B mediated_by the name of the connection to mediate this connection through. If given, the connection will be mediated through the named mediation connection. The mediation connection must set -.BR p2p_mediation=yes . +.BR mediation=yes . .TP -.B p2p_peerid +.B me_peerid ID as which the peer is known to the mediation server, ie. which the other end of this connection uses as its .B leftid on its connection to the mediation server. This is the ID we request the mediation server to mediate us with. If -.B p2p_peerid +.B me_peerid is not given, the .B rightid of this connection will be used as peer ID. diff --git a/src/starter/keywords.h b/src/starter/keywords.h index 79e4e4ea7..f71b0085f 100644 --- a/src/starter/keywords.h +++ b/src/starter/keywords.h @@ -87,8 +87,8 @@ typedef enum { KW_DPDACTION, KW_MODECONFIG, KW_XAUTH, - KW_ME_MEDIATION, - KW_ME_MEDIATED_BY, + KW_MEDIATION, + KW_MEDIATED_BY, KW_ME_PEERID, #define KW_CONN_FIRST KW_CONN_SETUP diff --git a/src/starter/keywords.txt b/src/starter/keywords.txt index 97bb4e450..af9eaa0cc 100644 --- a/src/starter/keywords.txt +++ b/src/starter/keywords.txt @@ -76,9 +76,9 @@ dpdtimeout, KW_DPDTIMEOUT dpdaction, KW_DPDACTION modeconfig, KW_MODECONFIG xauth, KW_XAUTH -p2p_mediation, KW_ME_MEDIATION -p2p_mediated_by, KW_ME_MEDIATED_BY -p2p_peerid, KW_ME_PEERID +mediation, KW_MEDIATION +mediated_by, KW_MEDIATED_BY +me_peerid, KW_ME_PEERID cacert, KW_CACERT ldaphost, KW_LDAPHOST ldapbase, KW_LDAPBASE |