Enable LocalDiscovery by default.

Recent improvements to the local discovery mechanism makes it cheaper,
more network-friendly, and now it cannot make things worse (as opposed
to the old mechanism). Thus there is no reason not to enable it by
default.

diff --git a/doc/tinc.conf.5.in b/doc/tinc.conf.5.in
index f208803acd7ad5d592cbe5b0cc67f0ff3dc0305c..01c7480216381efd0b51477ea466ea170c5a68c1 100644 (file)
--- a/doc/tinc.conf.5.in
+++ b/doc/tinc.conf.5.in
@@ -333,7 +333,7 @@ To only listen on a specific port but not on a specific address, use
 .Li *
 for the
 .Ar address .
-.It Va LocalDiscovery Li = yes | no Pq no
+.It Va LocalDiscovery Li = yes | no Pq yes
 When enabled,
 .Nm tinc
 will try to detect peers that are on the same local network.

diff --git a/src/net_packet.c b/src/net_packet.c
index 36386b58dd3d6757345ee831beabbc283e54a953..6b3183daa85c4f1b40134e9d5a16a047c2ab59e9 100644 (file)
--- a/src/net_packet.c
+++ b/src/net_packet.c
@@ -54,7 +54,7 @@ static char lzo_wrkmem[LZO1X_999_MEM_COMPRESS > LZO1X_1_MEM_COMPRESS ? LZO1X_999
 static void send_udppacket(node_t *, vpn_packet_t *);
 
 unsigned replaywin = 16;
-bool localdiscovery = false;
+bool localdiscovery = true;
 
 #define MAX_SEQNO 1073741824