Enable the SPTPS protocol by default.

diff --git a/doc/tinc.conf.5.in b/doc/tinc.conf.5.in
index 1cca3663c035c5102230b59b316b5160cfc8722a..89ef739708a4a2829003efad34f5ade4cbec5ee5 100644 (file)
--- a/doc/tinc.conf.5.in
+++ b/doc/tinc.conf.5.in
@@ -274,14 +274,12 @@ The file in which the private ECDSA key of this tinc daemon resides.
 This is only used if
 .Va ExperimentalProtocol
 is enabled.
-.It Va ExperimentalProtocol Li = yes | no Po no Pc Bq experimental
-When this option is enabled, experimental protocol enhancements will be used.
+.It Va ExperimentalProtocol Li = yes | no Pq yes
+When this option is enabled, the SPTPS protocol will be used when connecting to nodes that also support it.
 Ephemeral ECDH will be used for key exchanges,
 and ECDSA will be used instead of RSA for authentication.
 When enabled, an ECDSA key must have been generated before with
 .Nm tinc generate-ecdsa-keys .
-The experimental protocol may change at any time,
-and there is no guarantee that tinc will run stable when it is used.
 .It Va Forwarding Li = off | internal | kernel Po internal Pc Bq experimental
 This option selects the way indirect packets are forwarded.
 .Bl -tag -width indent

diff --git a/doc/tinc.texi b/doc/tinc.texi
index e1af55c33608210890cb593bd1f0211c22d545a5..fc94b0a5be42b8ff2e800e69b1e316694ab313de 100644 (file)
--- a/doc/tinc.texi
+++ b/doc/tinc.texi
@@ -1002,14 +1002,12 @@ The file in which the private ECDSA key of this tinc daemon resides.
 This is only used if ExperimentalProtocol is enabled.
 
 @cindex ExperimentalProtocol
-@item ExperimentalProtocol = <yes|no> (no) [experimental]
-When this option is enabled, experimental protocol enhancements will be used.
+@item ExperimentalProtocol = <yes|no> (yes)
+When this option is enabled, the SPTPS protocol will be used when connecting to nodes that also support it.
 Ephemeral ECDH will be used for key exchanges,
 and ECDSA will be used instead of RSA for authentication.
 When enabled, an ECDSA key must have been generated before with
 @samp{tinc generate-ecdsa-keys}.
-The experimental protocol may change at any time,
-and there is no guarantee that tinc will run stable when it is used.
 
 @cindex Forwarding
 @item Forwarding = <off|internal|kernel> (internal) [experimental]

diff --git a/src/net_setup.c b/src/net_setup.c
index a9947aad1a9eca0205afc82b4b910db0657eb457..6b55521b600b78b6c7995f4ea21d4bd25cc900a3 100644 (file)
--- a/src/net_setup.c
+++ b/src/net_setup.c
@@ -192,6 +192,8 @@ static bool read_ecdsa_private_key(void) {
 
        if(!fp) {
                logger(DEBUG_ALWAYS, LOG_ERR, "Error reading ECDSA private key file `%s': %s", fname, strerror(errno));
+               if(errno == ENOENT)
+                       logger(DEBUG_ALWAYS, LOG_INFO, "Create an ECDSA keypair with `tinc -n %s generate-ecdsa-keys'.", netname ?: ".");
                free(fname);
                return false;
        }

diff --git a/src/protocol.c b/src/protocol.c
index ad0fa8dda20033649f5c4a48cff203420833729a..d166305bee8185ff0397e71ff34e757091b4baf5 100644 (file)
--- a/src/protocol.c
+++ b/src/protocol.c
@@ -30,7 +30,7 @@
 
 bool tunnelserver = false;
 bool strictsubnets = false;
-bool experimental = false;
+bool experimental = true;
 
 /* Jumptable for the request handlers */