AM_CONDITIONAL(USE_MANAGER, test x$manager = xtrue)
AC_ARG_ENABLE(
- [p2p],
- AS_HELP_STRING([--enable-p2p],[enable mediation extensions for IKEv2 (default is NO).]),
+ [mediation],
+ AS_HELP_STRING([--enable-mediation],[enable IKEv2 Mediation Extension (default is NO).]),
[if test x$enableval = xyes; then
me=true
AC_DEFINE(ME)
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);
}
.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.
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
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
echo -n " --enable-eap-sim" >> $INSTALLSHELL
fi
-if [ "$USE_P2P" = "yes" ]
+if [ "$USE_ME" = "yes" ]
then
- echo -n " --enable-p2p" >> $INSTALLSHELL
+ echo -n " --enable-mediation" >> $INSTALLSHELL
fi
if [ "$USE_LEAK_DETECTIVE" = "yes" ]
USE_LIBCURL="yes"
USE_LDAP="yes"
USE_EAP_AKA="yes"
-USE_P2P="yes"
+USE_ME="yes"
USE_LEAK_DETECTIVE="no"
# Gentoo linux root filesystem
leftid=6cu1UTVw@medsrv.org
right=PH_IP_CAROL
rightid=carol@strongswan.org
- p2p_mediation=yes
+ mediation=yes
authby=psk
auto=add
right=%any
rightid=@venus.strongswan.org
rightsubnet=PH_IP_VENUS/32
- p2p_mediated_by=medsrv
- p2p_peerid=F1ubAio8@medsrv.org
+ mediated_by=medsrv
+ me_peerid=F1ubAio8@medsrv.org
auto=start
leftid=carol@strongswan.org
leftfirewall=yes
right=%any
- p2p_mediation=yes
+ mediation=yes
auto=add
right=PH_IP_CAROL
rightid=carol@strongswan.org
authby=psk
- p2p_mediation=yes
+ mediation=yes
auto=start
conn peer
right=%any
rightid=alice@strongswan.org
rightsubnet=PH_IP_ALICE/32
- p2p_mediated_by=medsrv
- p2p_peerid=6cu1UTVw@medsrv.org
+ mediated_by=medsrv
+ me_peerid=6cu1UTVw@medsrv.org
auto=add
leftid=6cu1UTVw@medsrv.org
right=PH_IP_CAROL
rightid=carol@strongswan.org
- p2p_mediation=yes
+ mediation=yes
authby=psk
auto=add
right=%any
rightid=bob@strongswan.org
rightsubnet=PH_IP_BOB/32
- p2p_mediated_by=medsrv
- p2p_peerid=av9oEPMz@medsrv.org
+ mediated_by=medsrv
+ me_peerid=av9oEPMz@medsrv.org
auto=start
right=PH_IP_CAROL
rightid=carol@strongswan.org
authby=psk
- p2p_mediation=yes
+ mediation=yes
auto=start
conn peer
right=%any
rightid=alice@strongswan.org
rightsubnet=PH_IP_ALICE/32
- p2p_mediated_by=medsrv
- p2p_peerid=6cu1UTVw@medsrv.org
+ mediated_by=medsrv
+ me_peerid=6cu1UTVw@medsrv.org
auto=add
leftid=carol@strongswan.org
leftfirewall=yes
right=%any
- p2p_mediation=yes
+ mediation=yes
auto=add