Set default value of DecrementTTL to "no".

Decrementing the TTL causes IPv6 to fail when Mode = switch, and there may be
other unforeseen side-effects.

diff --git a/doc/tinc.conf.5.in b/doc/tinc.conf.5.in
index d5757c82ee7e30d669ffdad7ccbc2f3d711e508a..fa6215330d03649d680831acbeabc0aa4f778e83 100644 (file)
--- a/doc/tinc.conf.5.in
+++ b/doc/tinc.conf.5.in
@@ -180,13 +180,15 @@ If you don't specify a host with
 won't try to connect to other daemons at all,
 and will instead just listen for incoming connections.
 
 won't try to connect to other daemons at all,
 and will instead just listen for incoming connections.
 

-.It Va DecrementTTL Li = yes | no Po yes Pc
+.It Va DecrementTTL Li = yes | no Po no Pc

 When enabled,
 .Nm tinc
 will decrement the Time To Live field in IPv4 packets, or the Hop Limit field in IPv6 packets,
 before forwarding a received packet to the virtual network device or to another node,
 and will drop packets that have a TTL value of zero,
 in which case it will send an ICMP Time Exceeded packet back.
 When enabled,
 .Nm tinc
 will decrement the Time To Live field in IPv4 packets, or the Hop Limit field in IPv6 packets,
 before forwarding a received packet to the virtual network device or to another node,
 and will drop packets that have a TTL value of zero,
 in which case it will send an ICMP Time Exceeded packet back.

+.Pp
+Do not use this option if you use switch mode and want to use IPv6.

 
 .It Va Device Li = Ar device Po Pa /dev/tap0 , Pa /dev/net/tun No or other depending on platform Pc
 The virtual network device to use.
 
 .It Va Device Li = Ar device Po Pa /dev/tap0 , Pa /dev/net/tun No or other depending on platform Pc
 The virtual network device to use.

diff --git a/doc/tinc.texi b/doc/tinc.texi
index 9e8929b022c5af5a7f0e826282c836c263177c95..bddc39a030d500e6f7af76f72835964c6b4f5ec1 100644 (file)
--- a/doc/tinc.texi
+++ b/doc/tinc.texi
@@ -794,12 +794,14 @@ tinc won't try to connect to other daemons at all,
 and will instead just listen for incoming connections.
 
 @cindex DecrementTTL
 and will instead just listen for incoming connections.
 
 @cindex DecrementTTL

-@item DecrementTTL = <yes | no> (yes)
+@item DecrementTTL = <yes | no> (no)

 When enabled, tinc will decrement the Time To Live field in IPv4 packets, or the Hop Limit field in IPv6 packets,
 before forwarding a received packet to the virtual network device or to another node,
 and will drop packets that have a TTL value of zero,
 in which case it will send an ICMP Time Exceeded packet back.
 
 When enabled, tinc will decrement the Time To Live field in IPv4 packets, or the Hop Limit field in IPv6 packets,
 before forwarding a received packet to the virtual network device or to another node,
 and will drop packets that have a TTL value of zero,
 in which case it will send an ICMP Time Exceeded packet back.
 

+Do not use this option if you use switch mode and want to use IPv6.
+

 @cindex Device
 @item Device = <@var{device}> (@file{/dev/tap0}, @file{/dev/net/tun} or other depending on platform)
 The virtual network device to use.
 @cindex Device
 @item Device = <@var{device}> (@file{/dev/tap0}, @file{/dev/net/tun} or other depending on platform)
 The virtual network device to use.

diff --git a/src/route.c b/src/route.c
index 051deffbc3adf2e42ee968726f1925988248296a..6eadb888162980633a2813e0da199092c61987ff 100644 (file)
--- a/src/route.c
+++ b/src/route.c
@@ -34,7 +34,7 @@
 
 rmode_t routing_mode = RMODE_ROUTER;
 fmode_t forwarding_mode = FMODE_INTERNAL;
 
 rmode_t routing_mode = RMODE_ROUTER;
 fmode_t forwarding_mode = FMODE_INTERNAL;

-bool decrement_ttl = true;
+bool decrement_ttl = false;

 bool directonly = false;
 bool priorityinheritance = false;
 int macexpire = 600;
 bool directonly = false;
 bool priorityinheritance = false;
 int macexpire = 600;