changed external interface to the mediation extension.

diff --git a/configure.in b/configure.in
index a7a11d2..0003e1b 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -452,8 +452,8 @@ AC_ARG_ENABLE(
 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)

diff --git a/src/charon/plugins/stroke/stroke_socket.c b/src/charon/plugins/stroke/stroke_socket.c
index ce07251..8ce757a 100644 (file)
--- 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 56032c7..bb108ca 100644 (file)
--- 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 79e4e4e..f71b008 100644 (file)
--- 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 97bb4e4..af9eaa0 100644 (file)
--- 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

diff --git a/testing/scripts/build-umlrootfs b/testing/scripts/build-umlrootfs
index d4d9734..dba999d 100755 (executable)
--- a/testing/scripts/build-umlrootfs
+++ b/testing/scripts/build-umlrootfs
@@ -151,9 +151,9 @@ then
     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" ]

diff --git a/testing/testing.conf b/testing/testing.conf
index 5088974..e14493c 100755 (executable)
--- a/testing/testing.conf
+++ b/testing/testing.conf
@@ -40,7 +40,7 @@ STRONGSWAN=$UMLTESTDIR/strongswan-4.2.0.tar.bz2
 USE_LIBCURL="yes"
 USE_LDAP="yes"
 USE_EAP_AKA="yes"
-USE_P2P="yes"
+USE_ME="yes"
 USE_LEAK_DETECTIVE="no"
 
 # Gentoo linux root filesystem

diff --git a/testing/tests/p2pnat/behind-same-nat/hosts/alice/etc/ipsec.conf b/testing/tests/p2pnat/behind-same-nat/hosts/alice/etc/ipsec.conf
index 6ddb04a..b47f157 100755 (executable)
--- a/testing/tests/p2pnat/behind-same-nat/hosts/alice/etc/ipsec.conf
+++ b/testing/tests/p2pnat/behind-same-nat/hosts/alice/etc/ipsec.conf
@@ -21,7 +21,7 @@ conn medsrv
        leftid=6cu1UTVw@medsrv.org
        right=PH_IP_CAROL
        rightid=carol@strongswan.org
-       p2p_mediation=yes
+       mediation=yes
        authby=psk
        auto=add
 
@@ -31,6 +31,6 @@ conn peer
        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

diff --git a/testing/tests/p2pnat/behind-same-nat/hosts/carol/etc/ipsec.conf b/testing/tests/p2pnat/behind-same-nat/hosts/carol/etc/ipsec.conf
index 712d888..e38922c 100755 (executable)
--- a/testing/tests/p2pnat/behind-same-nat/hosts/carol/etc/ipsec.conf
+++ b/testing/tests/p2pnat/behind-same-nat/hosts/carol/etc/ipsec.conf
@@ -21,5 +21,5 @@ conn medsrv
        leftid=carol@strongswan.org
        leftfirewall=yes
        right=%any
-       p2p_mediation=yes
+       mediation=yes
        auto=add

diff --git a/testing/tests/p2pnat/behind-same-nat/hosts/venus/etc/ipsec.conf b/testing/tests/p2pnat/behind-same-nat/hosts/venus/etc/ipsec.conf
index 0a4bb64..3943c36 100755 (executable)
--- a/testing/tests/p2pnat/behind-same-nat/hosts/venus/etc/ipsec.conf
+++ b/testing/tests/p2pnat/behind-same-nat/hosts/venus/etc/ipsec.conf
@@ -22,7 +22,7 @@ conn medsrv
        right=PH_IP_CAROL
        rightid=carol@strongswan.org
        authby=psk
-       p2p_mediation=yes
+       mediation=yes
        auto=start
 
 conn peer 
@@ -31,6 +31,6 @@ 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

diff --git a/testing/tests/p2pnat/medsrv-psk/hosts/alice/etc/ipsec.conf b/testing/tests/p2pnat/medsrv-psk/hosts/alice/etc/ipsec.conf
index 8dd4142..99a50d5 100755 (executable)
--- a/testing/tests/p2pnat/medsrv-psk/hosts/alice/etc/ipsec.conf
+++ b/testing/tests/p2pnat/medsrv-psk/hosts/alice/etc/ipsec.conf
@@ -21,7 +21,7 @@ conn medsrv
        leftid=6cu1UTVw@medsrv.org
        right=PH_IP_CAROL
        rightid=carol@strongswan.org
-       p2p_mediation=yes
+       mediation=yes
        authby=psk
        auto=add
 
@@ -31,6 +31,6 @@ conn peer
        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

diff --git a/testing/tests/p2pnat/medsrv-psk/hosts/bob/etc/ipsec.conf b/testing/tests/p2pnat/medsrv-psk/hosts/bob/etc/ipsec.conf
index abf4320..39dee85 100755 (executable)
--- a/testing/tests/p2pnat/medsrv-psk/hosts/bob/etc/ipsec.conf
+++ b/testing/tests/p2pnat/medsrv-psk/hosts/bob/etc/ipsec.conf
@@ -22,7 +22,7 @@ conn medsrv
        right=PH_IP_CAROL
        rightid=carol@strongswan.org
        authby=psk
-       p2p_mediation=yes
+       mediation=yes
        auto=start
 
 conn peer
@@ -31,6 +31,6 @@ 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

diff --git a/testing/tests/p2pnat/medsrv-psk/hosts/carol/etc/ipsec.conf b/testing/tests/p2pnat/medsrv-psk/hosts/carol/etc/ipsec.conf
index 712d888..e38922c 100755 (executable)
--- a/testing/tests/p2pnat/medsrv-psk/hosts/carol/etc/ipsec.conf
+++ b/testing/tests/p2pnat/medsrv-psk/hosts/carol/etc/ipsec.conf
@@ -21,5 +21,5 @@ conn medsrv
        leftid=carol@strongswan.org
        leftfirewall=yes
        right=%any
-       p2p_mediation=yes
+       mediation=yes
        auto=add