thorkill [Tue, 7 Jul 2015 19:19:26 +0000 (21:19 +0200)]
Make sure we do not allocate new edge when talking to old nodes and the same edge already exists
When tinc gets ADD_EDGE from older versions it will allocate
new edge in protocol_edge.c:189 due to missed case in lines 149-171 where
local_address is not defined.
Guus Sliepen [Sun, 12 Jul 2015 11:08:34 +0000 (13:08 +0200)]
Make subnet caches static.
thorkill [Tue, 30 Jun 2015 17:11:45 +0000 (19:11 +0200)]
Included missing names.h
Guus Sliepen [Sun, 12 Jul 2015 11:05:51 +0000 (13:05 +0200)]
Use AC_CONFIG_MACRO_DIRS([m4]).
Guus Sliepen [Sun, 12 Jul 2015 10:55:13 +0000 (12:55 +0200)]
Remove unused code that caused warnings about an uninitialized variable.
thorkill [Sun, 28 Jun 2015 22:23:13 +0000 (00:23 +0200)]
Removed double break;
Guus Sliepen [Sun, 12 Jul 2015 10:33:07 +0000 (12:33 +0200)]
Fix undefined behaviour when left-shifting signed integers.
Found by -fsanitize=undefined.
Guus Sliepen [Sat, 4 Jul 2015 15:53:11 +0000 (17:53 +0200)]
Call sockaddrfree(&e->local_address) in free_edge() instead of exit_edges().
The proper place to clean up resources of objects is in their
destructor. This makes sure proper cleanup when edge_del() is called as
well. At exit, free_edge() is called on all edges by free_edge_tree(),
which is called by exit_nodes().
Guus Sliepen [Sat, 4 Jul 2015 15:51:05 +0000 (17:51 +0200)]
Coalesce two if statements that check for the same thing.
Jo-Philipp Wich [Thu, 18 Jun 2015 21:58:31 +0000 (23:58 +0200)]
fix musl compatibility
Let configure include sys/if_tun.h when testing for netinet/if_ether.h
to detect the Kernel/libc header conflict on musl.
After this patch, configure will correctly detect netinet/if_ether.h as
unusable and the subsequent compilation will not attempt to use it.
Conflicts:
src/have.h
Guus Sliepen [Sat, 4 Jul 2015 15:18:40 +0000 (17:18 +0200)]
Don't #include OpenSSL headers when compiling without OpenSSL.
thorkill [Sat, 4 Jul 2015 01:21:01 +0000 (03:21 +0200)]
Cleanup local_address in protocol_edge.c
In line 131 local_address has been defined,
but the memory was never freed on return.
thorkill [Sat, 4 Jul 2015 00:39:12 +0000 (02:39 +0200)]
Cleanup edges stored in edge_weight_tree on exit
protocol_edge.c: 131 defines local_address using str2sockaddr
str2sockaddr() allocates memory which has to be freed on exit.
thorkill [Fri, 3 Jul 2015 22:29:36 +0000 (00:29 +0200)]
Fixed 2 leaks in setup_myself()
Florian Klink [Thu, 2 Jul 2015 10:35:42 +0000 (12:35 +0200)]
setup_outgoing_connection: log to LOG_DEBUG on if no known address
With AutoConnect = yes, tinc tries to establish connections to known hosts.
However, you could have set no Address for this host, which is perfectly fine
(as long as there is at least one bootstrap node with an address or a local
discovered node already part of the network)
So log this to LOG_DEBUG
Florian Klink [Thu, 2 Jul 2015 10:35:41 +0000 (12:35 +0200)]
(read|append)_config_file: log open errors as LOG_DEBUG
In a "decentrally managed vpn" it is very likely that host config
files for some reachable nodes do not exist. Currently, tinc
fills the logs with "Cannot open config file" messages.
This commit changes the log level to LOG_DEBUG so
syslog doesn't get filled by default.
Etienne Dechamps [Sat, 20 Jun 2015 10:41:20 +0000 (11:41 +0100)]
Protect against callbacks removing items from the io tree.
The definition of the splay_each() macro is somewhat complicated for
syntactic reasons. Here's what it does in a more readable way:
for (splay_node_t* node = tree->head; node;) {
type* item = node->data;
splay_node_t* next = node->next;
// RUN USER BLOCK with (item)
node = next;
}
list_each() works in the same way. Since node->next is saved before the
user block runs, this construct supports removing the current item from
within the user block. However, what it does *not* support is removing
*other items* from within the user block, especially the next item.
Indeed, that will invalide the next pointer in the above loop and
therefore result in an invalid pointer dereference.
Unfortunately, there is at least one code path where that unsupported
operation happens. It is located in ack_h(), where the authentication
protocol code detects a double connection (i.e. being connected to
another node twice). Running in the context of a socket read event, this
code will happily terminate the *other* metaconnection, resulting in its
socket being removed from the io tree. If, by misfortune, this other
metaconnection happened to have the next socket FD number (which is
quite possible due to FD reuse - albeit unlikely), and was part of the
io tree (which is quite likely because if that connection is stuck, it
will most likely have pending writes) then this will result in the next
pending io item being destroyed. Invalid pointer dereference ensues.
I did a quick audit of other uses of splay_each() and list_each() and
I believe this is the only scenario in which this "next pointer
invalidation" problem can occur in practice. While this bug has been
there since at least
6bc5d626a8726fc23365ee705761a3c666a08ad4 (November
2012), if not sooner, it happens quite rarely due to the very specific
set of conditions required to trigger it. Nevertheless, it does manage
to crash my central production nodes every other week or so.
Dato Simó [Tue, 16 Jun 2015 23:44:45 +0000 (20:44 -0300)]
Fix typo in tinc.texi.
Guus Sliepen [Wed, 10 Jun 2015 21:42:17 +0000 (23:42 +0200)]
Fix crash is sptps_logger().
Unfortunately, sptps_logger() cannot know if s->handle is pointing to a
connection_t or a node_t. But it needs to print name and hostname in
both cases. So make sure both types have name and hostname fields at the
start with the same offset.
Guus Sliepen [Sun, 7 Jun 2015 21:20:14 +0000 (23:20 +0200)]
Fix alignment of output of sptps_speed.
Guus Sliepen [Sun, 7 Jun 2015 21:14:48 +0000 (23:14 +0200)]
Fix receiving SPTPS data in sptps_speed and sptps_test.
The sptps_receive_data() was changed in commit
d237efd to only process
one SPTPS record from a stream input. So now we have to put a loop
around it to ensure we process everything.
Guus Sliepen [Sun, 7 Jun 2015 20:50:05 +0000 (22:50 +0200)]
Fix warnings about missing return value checks.
In some harmless places, checks for the return value of ECDSA and RSA
key generation and verification was omitted. Add them to keep the
compiler happy and to warn end users in case something is wrong.
Guus Sliepen [Sun, 7 Jun 2015 20:25:22 +0000 (22:25 +0200)]
Fix autoconf check for function attributes.
GCC warns when a function attribute has no effect. The autoconf check
turns warnings about attributes into errors, therefore thinking that
they did not work. The reason was that the test function returned void,
which is not suitable for checking both __malloc__ and
__warn_unused_result__.
Guus Sliepen [Sun, 31 May 2015 21:51:39 +0000 (23:51 +0200)]
Fix missing return value caused by the previous commit.
Etienne Dechamps [Sun, 31 May 2015 19:19:48 +0000 (20:19 +0100)]
Don't try to relay packets to unreachable nodes.
It is not unusual for tinc to receive SPTPS packets to be relayed to
nodes that just became unreachable, due to state propagation delays in
the metagraph.
Unfortunately, the current code doesn't handle that situation correctly,
and still tries to relay the packet to the unreachable node. This
typically ends up segfaulting.
This commit fixes the issue by checking for reachability before relaying
the packet.
Etienne Dechamps [Sun, 24 May 2015 08:49:16 +0000 (09:49 +0100)]
Fix invalid pointer use in get_my_hostname().
clang-3.7 warnings surfaced an actual bug:
invitation.c:185:5: error: address of array 'filename' will always evaluate to 'true'
[-Werror,-Wpointer-bool-conversion]
if(filename) {
~~ ^~~~~~~~
The regression was introduced in
3ccdf50beb6b2d3f2730bdc66006b43190537cde.
Etienne Dechamps [Sun, 24 May 2015 08:45:09 +0000 (09:45 +0100)]
Fix wrong format string type in send_sptps_tcppacket().
This issue was found through a clang-3.7 warning:
protocol_misc.c:167:46: error: format specifies type 'short' but the argument has type 'int'
[-Werror,-Wformat]
if(!send_request(c, "%d %hd", SPTPS_PACKET, len))
~~~ ^~~
%d
Etienne Dechamps [Sat, 23 May 2015 16:24:05 +0000 (17:24 +0100)]
Don't set up an ongoing connection to myself.
It is entirely possible that the configuration file could contain a
ConnectTo statement refering to its own name; that's a reasonable
scenario when one deploys semi-automatically generated tinc.conf files.
Amusingly, tinc does not like that at all, and actually sets up an
outgoing_t structure to myself (which obviously makes no sense). This is
mostly benign, though it does result in non-sensical "Already connected
to myself" messages every retry interval.
However, that also makes things blow up in close_network_connections(),
because there we delete the entire outgoing list and *then* the myself
node, which still has a reference to the freshly deleted outgoing
structure. Boom.
Etienne Dechamps [Sat, 23 May 2015 09:24:00 +0000 (10:24 +0100)]
Fix crashes when trying unreachable nodes.
timeout_handler() calls try_tx(c->node) when c->edge exists.
Unfortunately, the existence of c->edge is not enough to conclude that
the node is reachable.
In fact, during connection establishment, there is a short period of
time where we create an edge for the node at the other end of the
metaconnection, but we don't have one from the other side yet.
Unfortunately, if timeout_handler() runs during that short time
window, it will call try_tx() on an unreachable node, which makes
things explode because that function is not prepared to handle that
case.
A typical symptom of this race condition is a hard SEGFAULT while trying
to send packets using metaconnections that don't exist, due to
n->nexthop containing garbage.
This patch fixes the issue by making try_tx() check for reachability,
and then making all code paths use try_tx() instead of the more
specialized methods so that they go through the check.
This regression was introduced in
eb7a0db18ea71a44999d6a37b4b179dac0ed9bc7.
Guus Sliepen [Thu, 21 May 2015 09:09:01 +0000 (11:09 +0200)]
Update copyright notices.
Guus Sliepen [Thu, 21 May 2015 09:06:38 +0000 (11:06 +0200)]
Set the CLOEXEC flag on the umbilical socket.
Guus Sliepen [Wed, 20 May 2015 19:28:54 +0000 (21:28 +0200)]
Use socketpair() instead of pipe() for the umbilical.
This prepares for a possible conversion of the umbilical socket to a
control socket.
Guus Sliepen [Wed, 20 May 2015 19:25:06 +0000 (21:25 +0200)]
Don't write log messages to the umbilical pipe if we don't detach.
If we run in the foreground and are started by the CLI, this would
otherwise cause the first few log messages to appear twice.
Guus Sliepen [Wed, 20 May 2015 14:59:43 +0000 (16:59 +0200)]
Ensure "tinc start" knows if the daemon really started succesfully.
We do this by creating an umbilical between the CLI and the daemon. The
daemon pipes log messages to the CLI until it starts the main loop. The
daemon then cuts the umbilical. The CLI copies all the received log
messages to stderr, and the last byte indicates whether the daemon
started succesfully or not, so the CLI can exit with a useful exit code.
Guus Sliepen [Wed, 20 May 2015 09:11:12 +0000 (11:11 +0200)]
Fix check for LOCALSTATEDIR accessibility for the CLI.
The CLI does not need write access to the directory where the PID file
is stored, it just needs to be able to read the PID file.
Guus Sliepen [Tue, 19 May 2015 22:55:00 +0000 (00:55 +0200)]
Allocate temporary filenames on the stack.
This gets rid of xasprintf() in a number of places, and removes the need
to free() the temporary strings. A few potential memory leaks have been
fixed.
Guus Sliepen [Tue, 19 May 2015 22:12:01 +0000 (00:12 +0200)]
Allow dumping a list of outstanding invitations.
This dumps the name of the invitation file, as well as the name of the
node that is being invited. This can make it easier to find the
invitation file belonging to a given node.
Guus Sliepen [Tue, 19 May 2015 22:02:53 +0000 (00:02 +0200)]
Add "list" as an alias for "dump" in the CLI.
Guus Sliepen [Tue, 19 May 2015 20:26:32 +0000 (22:26 +0200)]
Quit with an error message if ioctl(TUNSETIFF) fails.
It is possible that opening /dev/net/tun works but that interface
creation itself fails, for example if a non-root user tries to create a
new interface, or if the desired interface is already opened by another
process. In this case, the ioctl() fails, but we actually silently
ignored this condition.
Guus Sliepen [Tue, 19 May 2015 20:17:18 +0000 (22:17 +0200)]
If LOCALSTATEDIR is inaccessible, store the pid and socket files in the configuration directory.
The compile time local state directory is usually /var or
/usr/local/var. If this is not accessible for some reason, for example
because someone ./configured tinc without --localstatedir and
/usr/local/var does not exist, or if tinc is started by a non-root user,
then tinc will fall back to the directory where tinc.conf is stored.
A warning is logged when this happens.
Guus Sliepen [Tue, 19 May 2015 19:32:30 +0000 (21:32 +0200)]
Don't log seqno failures in sptps_verify_datagram().
This function is not used for normal traffic, only when a packet from an
unknown source is received and we need to check against candidates. No
failures should be logger in this case; if the packet is really not
valid this will be logged by handle_incoming_vpn_data().
Guus Sliepen [Tue, 19 May 2015 19:23:35 +0000 (21:23 +0200)]
Add source of SPTPS errors to log messages.
Guus Sliepen [Tue, 19 May 2015 12:25:20 +0000 (14:25 +0200)]
Add newline at end of precomp_data.h and sc.h.
Guus Sliepen [Tue, 19 May 2015 12:09:53 +0000 (14:09 +0200)]
Fix src/Makefile.am for *BSD.
Apparently the BSDs don't like $(srcdir) but want to see ${srcdir} in
their rules.
Guus Sliepen [Tue, 19 May 2015 11:31:26 +0000 (13:31 +0200)]
Remove info-in-builddir option from AM_INIT_AUTOMAKE().
This option is not supported by older, but still widely used versions of
automake. The drawback is that when doing multiple VPATH builds in a
row, the info manual may mention incorrect paths, but it doesn't affect
the executables at all.
Sven-Haegar Koch [Wed, 13 May 2015 19:24:29 +0000 (21:24 +0200)]
Fix check for public key in invite-join.test.
Small fix to test/invite-join.test, comparing no-longer-existing
ECDSAPublicKey does not make sense.
Etienne Dechamps [Mon, 18 May 2015 20:06:16 +0000 (21:06 +0100)]
Fix direct UDP communciation with pre-relaying 1.1 nodes.
try_tx_sptps() gives up on UDP communication if the recipient doesn't
support relaying. This is too restrictive - we only need the other node
to support relaying if we actually want to relay through them. If the
packet is sent directly, it's fine to send it to an old pre-node-IDs
tinc-1.1 node.
Etienne Dechamps [Mon, 18 May 2015 19:48:45 +0000 (20:48 +0100)]
Don't parse node IDs if the sending node doesn't support them.
Currently, tinc tries to parse node IDs for all SPTPS packets, including
ones sent from older, pre-node-IDs tinc-1.1 nodes, and therefore doesn't
recognize packets from these nodes. This commit fixes that.
It also makes code slightly clearer by reducing the amount of fiddling
around packet offset/length.
Etienne Dechamps [Mon, 18 May 2015 19:35:44 +0000 (20:35 +0100)]
Fix SPTPS condition in try_harder().
A condition in try_harder() is always evaluating to false when talking
to a SPTPS node because n->status.validkey_in is always false in that
case. Fix the condition so that the SPTPS status is correctly checked.
This prevented recent tinc-1.1 nodes from talking to older, pre-node-ID
tinc-1.1 nodes.
The regression was introduced in
6056f1c13bb37bf711dff9c25a6eaea99f14d31f.
Etienne Dechamps [Sun, 17 May 2015 21:36:15 +0000 (22:36 +0100)]
Don't pollute the system header directory namespace.
Since commit
13f9bc1ff199bea46d3dde391a848f119e2cc0f0, tinc passes the
-I. option to the preprocessor so that version_git.h can be found during
out-of-tree ("VPATH") builds.
The problem is, this option also affects the directory search for files
included *from* system headers. For example, on MinGW, unistd.h contains
the following line:
#include <process.h>
Which, due to -I. putting the tinc directory at the head of the search
order, results in tinc's process.h being included instead of the file
from MinGW. Hilarity ensues.
This commit fixes the issue by using -iquote, which doesn't affect
system headers.
Etienne Dechamps [Sun, 17 May 2015 21:21:11 +0000 (22:21 +0100)]
Make sure the MIN() macro is defined.
On MinGW this is not automatically the case, thereby breaking the build.
Guus Sliepen [Sun, 17 May 2015 19:07:45 +0000 (21:07 +0200)]
Merge remote-tracking branches 'dechamps/sptpsrestart' and 'dechamps/keychanged' into 1.1
Etienne Dechamps [Sun, 17 May 2015 18:23:12 +0000 (19:23 +0100)]
Don't send KEY_CHANGED messages if we don't support the legacy protocol.
KEY_CHANGED messages are only useful to invalidate keys for non-SPTPS nodes;
SPTPS nodes use a different internal mechanism (forced KEX) for that purpose.
Therefore, if we know we can't talk to legacy nodes, there's no point in
sending them these messages.
Etienne Dechamps [Sun, 17 May 2015 17:50:11 +0000 (18:50 +0100)]
Proactively restart the SPTPS tunnel if we get receive errors.
There are a number of ways a SPTPS tunnel can get into a corrupt state.
For example, during key regeneration, the KEX and SIG messages from
other nodes might arrive out of order, which confuses the hell out of
the SPTPS code. Another possible scenario is not noticing another node
crashed and restarted because there was no point in time where the node
was seen completely disconnected from *all* nodes; this could result in
using the wrong (old) key. There are probably other scenarios which have
not even been considered yet. Distributed systems are hard.
When SPTPS got confused by a packet, it used to crash the entire
process; fortunately that was fixed by commit
2e7f68ad2b51648b89c4b5c61aeb4cec67c2fbbb. However, the error handling
(or lack thereof) leaves a lot to be desired. Currently, when SPTPS
encounters an error when receiving a packet, it just shrugs it off and
continues as if nothing happened. The problem is, sometimes getting
receive errors mean the tunnel is completely stuck and will not recover
on its own. In that case, the node will become unreachable - possibly
indefinitely.
The goal of this commit is to improve SPTPS error handling by taking
proactive action when an incoming packet triggers a failure, which is
often an indicator that the tunnel is stuck in some way. When that
happens, we simply restart SPTPS entirely, which should make the tunnel
recover quickly.
To prevent "storms" where two buggy nodes flood each other with invalid
packets and therefore spend all their time negotiating new tunnels, we
limit the frequency at which tunnel restarts happen to ten seconds.
It is likely this commit will solve the "Invalid KEX record length
during key regeneration" issue that has been seen in the wild. It is
difficult to be sure though because we do not have a full understanding
of all the possible conditions that can trigger this problem.
Etienne Dechamps [Sun, 17 May 2015 16:51:05 +0000 (17:51 +0100)]
Trivial: make sptps_receive_data_datagram() a little more readable.
The new code updates variables as stuff is being consumed, so that the
reader doesn't have to do that in his head.
Guus Sliepen [Sun, 17 May 2015 16:44:09 +0000 (18:44 +0200)]
Don't send local_address in ADD_EDGE messages if it's AF_UNSPEC.
Sven-Haegar Koch [Sun, 17 May 2015 03:29:21 +0000 (05:29 +0200)]
Let sockaddr2hostname() handle AF_UNSPEC addresses.
Etienne Dechamps [Sun, 17 May 2015 16:09:56 +0000 (17:09 +0100)]
Prevent SPTPS key regeneration packets from entering an UDP relay path.
Commit
10c1f60c643607d9dafd79271c3475cddf81e903 introduced a mechanism
by which a packet received by REQ_KEY could continue its journey over
UDP. This was based on the assumption that REQ_KEY messages would never
be used for handshake packets (which should never be sent over UDP,
because SPTPS currently doesn't handle lost handshake packets very
well).
Unfortunately, there is one case where handshake packets are sent using
REQ_KEY: when regenerating the SPTPS key for a pre-established channel.
With the current code, such packets risk getting relayed over UDP.
When processing a REQ_KEY message, it is impossible for the receiving
end to distinguish between a data SPTPS packet and a handshake packet,
because this information is stored in the type field which is encrypted
with the end-to-end key.
This commit fixes the issue by making tinc use ANS_KEY for all SPTPS
handshake messages. This works because ANS_KEY messages are never
forwarded using the SPTPS relay mechanisms, therefore they are
guaranteed to stick to TCP.
Guus Sliepen [Sat, 16 May 2015 00:01:54 +0000 (02:01 +0200)]
Let sockaddr2str() handle AF_UNSPEC addresses.
Guus Sliepen [Fri, 15 May 2015 21:35:46 +0000 (23:35 +0200)]
Try all addresses for the hostname in an invitation URL.
Guus Sliepen [Fri, 15 May 2015 21:08:53 +0000 (23:08 +0200)]
Be more liberal accepting ADD_EDGE messages with conflicting local address information.
If the ADD_EDGE is for one of the edges we own, and if it is not the
same as we actually have, send a correcting ADD_EDGE back. Otherwise, if
the ADD_EDGE contains new information, update our idea of the local
address for that edge.
If the ADD_EDGE does not contain local address information, then we
never make a correction nor log a warning.
Guus Sliepen [Fri, 15 May 2015 21:01:06 +0000 (23:01 +0200)]
Use AF_UNSPEC instead of AF_UNKNOWN for unspecified local address in add_edge_h().
AF_UNKNOWN is reserved for valid addresses that the local node cannot
parse, but remote nodes possibly can.
Guus Sliepen [Thu, 14 May 2015 22:21:48 +0000 (00:21 +0200)]
Fix receiving UDP packets from tinc 1.0.x nodes.
In try_mac(), the wrong offsets were used into the packet buffer,
causing the digest verification to always fail.
Guus Sliepen [Wed, 13 May 2015 12:28:28 +0000 (14:28 +0200)]
Fix invitations.
These were broken due to a change in behaviour of sptps_receive_data()
introduced in commit
d237efd325cd7bdd73f5eb111c769470238dce6e.
Etienne Dechamps [Sun, 10 May 2015 18:00:03 +0000 (19:00 +0100)]
Introduce raw TCP SPTPS packet transport.
Currently, SPTPS packets are transported over TCP metaconnections using
extended REQ_KEY requests, in order for the packets to pass through
tinc-1.0 nodes unaltered. Unfortunately, this method presents two
significant downsides:
- An already encrypted SPTPS packet is decrypted and then encrypted
again every time it passes through a node, since it is transported
over the SPTPS channels of the metaconnections. This
double-encryption is unnecessary and wastes CPU cycles.
- More importantly, the only way to transport binary data over
standard metaconnection messages such as REQ_KEY is to encode it
in base64, which has a 33% encoding overhead. This wastes 25% of the
network bandwidth.
This commit introduces a new protocol message, SPTPS_PACKET, which can
be used to transport SPTPS packets over a TCP metaconnection in an
efficient way. The new message is appropriately protected through a
minor protocol version increment, and extended REQ_KEY messages are
still used with nodes that do not support the new message, as well as
for the intial handshake packets, for which efficiency is not a concern.
The way SPTPS_PACKET works is very similar to how the traditional PACKET
message works: after the SPTPS_PACKET message, the raw binary packet is
sent directly over the metaconnection. There is one important
difference, however: in the case of SPTPS_PACKET, the packet is sent
directly over the TCP stream completely bypassing the SPTPS channel of
the metaconnection itself for maximum efficiency. This is secure because
the SPTPS packet that is being sent is already encrypted with an
end-to-end key.
Etienne Dechamps [Sun, 10 May 2015 18:28:11 +0000 (19:28 +0100)]
Only read one record at a time in sptps_receive_data().
sptps_receive_data() always consumes the entire buffer passed to it,
which is somewhat inflexible. This commit improves the interface so that
sptps_receive_data() consumes at most one record. The goal is to allow
non-SPTPS stuff to be interleaved with SPTPS records in a single TCP
stream.
Etienne Dechamps [Sun, 10 May 2015 17:05:19 +0000 (18:05 +0100)]
Rename REQ_SPTPS to SPTPS_PACKET.
REQ_SPTPS implies the message has an ANS_ counterpart (like REQ_KEY,
ANS_KEY), but it doesn't. Therefore dropping the REQ_ seems more
appropriate, and we add a _PACKET suffix to reduce the likelihood of
naming conflicts.
Etienne Dechamps [Sat, 9 May 2015 17:09:23 +0000 (18:09 +0100)]
Try to use UDP to relay SPTPS packets received over TCP.
Currently, when tinc receives a SPTPS packet over TCP via the REQ_KEY
encapsulation mechanism, it forwards it like any other TCP request. This
is inefficient, because even though we received the packet over TCP,
we might have an UDP link with the next hop, which means the packet
could be sent over UDP.
This commit removes that limitation by making sure SPTPS data packets
received through REQ_KEY requests are not forwarded as-is but passed
to send_sptps_data() instead, thereby using the same code path as if
the packet was received over UDP.
Etienne Dechamps [Sat, 9 May 2015 16:54:34 +0000 (17:54 +0100)]
Expose the raw SPTPS send interface from net_packet.
net_packet doesn't actually use send_sptps_data(); it only uses
send_sptps_data_priv(). In addition, the only user of send_sptps_data()
is protocol_key. Therefore it makes sense to expose
send_sptps_data_priv() directly, and move send_sptps_data() (which is
basically just boilerplate) as a local function in protocol_key.
Etienne Dechamps [Sun, 10 May 2015 17:46:47 +0000 (18:46 +0100)]
Use the correct originator node when relaying SPTPS UDP packets.
Currently, when relaying SPTPS UDP packets, the code uses the direct
sender as the originator, instead of preserving the original source ID.
This wouldn't cause any issues in most cases because the originator and
the sender are the same in simple one-hop relay chains, but this will
break as soon as there is more than one relay.
Etienne Dechamps [Sun, 10 May 2015 17:37:30 +0000 (18:37 +0100)]
When relaying, send probes to the destination, not the source.
This seems to be a typo from
c23e50385d9de538af676706596f6508b2ceb01a.
Achievement unlocked: got a one-line commit wrong.
Etienne Dechamps [Sat, 12 Jul 2014 15:01:41 +0000 (16:01 +0100)]
Add support for out-of-tree ("VPATH") builds.
This fixes some issues with the build system when building out of tree.
With this commit, it is now possible to do the following:
$ cd /tmp/build
$ /path/to/tinc/configure
$ make
Etienne Dechamps [Sat, 12 Jul 2014 15:21:32 +0000 (16:21 +0100)]
Remove explicit distribution rules for m4 scripts.
It turns out Automake is smart enough to include these files in the
distribution by itself.
Guus Sliepen [Sat, 9 May 2015 13:41:37 +0000 (15:41 +0200)]
Really remove "release-" from the git-derived version string.
Etienne Dechamps [Sun, 29 Jun 2014 17:26:55 +0000 (18:26 +0100)]
Use git describe to populate autoconf's VERSION.
This uses the output of "git describe" directly in configure.ac to
determine the version number to use, instead of hardcoding it.
With this change, current version information is completely removed
from the codebase itself, and is always fetched on-the-fly from git as
the single source of truth.
In order to ensure make dist always uses the current version number in
the contents of the packaged configure script as well as the package
name, a dependency is added to the dist target such that autoconf is
always run before dist to regenerate the version number. If this wasn't
the case, make dist would use the version number from when autoconf was
originally run, not the version number that make dist is running from.
That said, errors from that rule are ignored so that people can still
run make dist without a working autoconf.
In addition, the NEWS check is dropped, as it would then become annoying
because it would force make dist users to always have a line for the
current commit in the NEWS file.
Pierre Emeriaud [Fri, 8 May 2015 22:03:51 +0000 (00:03 +0200)]
Fix typo in tincctl help.
Guus Sliepen [Tue, 5 May 2015 21:05:22 +0000 (23:05 +0200)]
Don't include build-time generated version_git.h in the tarball.
Guus Sliepen [Tue, 5 May 2015 21:03:41 +0000 (23:03 +0200)]
Remove "release-" from displayed git version.
Also make sure that version_git.h is only written to if the "git
describe" command succeeds.
Etienne Dechamps [Sun, 29 Jun 2014 14:22:10 +0000 (15:22 +0100)]
Use git description as the tinc version.
Instead of using the hardcoded version number in configure.ac, this
makes tinc use the live version reported by "git describe",
queried on-the-fly during the build process and regenerated for every
build.
This makes tinc version output more useful, as tinc will now display the
number of commits since the last tag as well as the commit the binary is
built from, following the format described in git-describe(1).
Here's an example of tincd --version output:
tinc version
release-1.1pre10-48-gc149315 (built Jun 29 2014 15:21:10, protocol 17.3)
When building directly from a release tag, this will look like the following:
tinc version release-1.1pre10 (built Jun 29 2014 15:21:10, protocol 17.3)
(Note that the format is slightly different - because of the way the
tags are named, it says "release-1.1pre10" instead of just "1.1pre10")
If git describe fails (for example when building from a release
tarball), the build automatically falls back to the autoconf-provided
VERSION macro (i.e. the old behavior).
Guus Sliepen [Fri, 24 Apr 2015 21:51:29 +0000 (23:51 +0200)]
Fix typo
0fda572c88d02b0b200ef81d72cc4da594fa0e38 that prevented some errors from being logged.
Guus Sliepen [Fri, 24 Apr 2015 21:43:58 +0000 (23:43 +0200)]
Don't log an error message when receiving a TERMREQ.
Guus Sliepen [Fri, 24 Apr 2015 21:43:19 +0000 (23:43 +0200)]
Fix a possible segmentation fault during key upgrades.
read_rsa_public_key() was bailing out early if the given node already has an
Ed25519 key, and
returned true even though c->rsa was NULL. The early bailout code isn't necessary anymore, so just
remove it.
Guus Sliepen [Fri, 24 Apr 2015 21:40:20 +0000 (23:40 +0200)]
Allow one-sided upgrades to
Ed25519.
This deals with the case where one node knows the
Ed25519 key of another node, but not the other
way around. This was blocked by an overly paranoid check in id_h(). The upgrade_h() function already
handled this case, and the node that already knows the other's
Ed25519 key checks that it has not
been changed, otherwise the connection will be aborted.
Guus Sliepen [Sun, 12 Apr 2015 13:43:05 +0000 (15:43 +0200)]
Merge remote-tracking branch 'dechamps/wintapver' into 1.1
Guus Sliepen [Sun, 12 Apr 2015 13:42:48 +0000 (15:42 +0200)]
Always call res_init() before getaddrinfo().
Unfortunately, glibc assumes that /etc/resolv.conf is a static file that
never changes. Even on servers, /etc/resolv.conf might be a dynamically
generated file, and we never know when it changes. So just call
res_init() every time, so glibc uses up-to-date nameserver information.
Conflicts:
src/have.h
src/net.c
src/net_setup.c
Guus Sliepen [Sun, 12 Apr 2015 13:36:50 +0000 (15:36 +0200)]
Merge remote-tracking branch 'dechamps/windevice' into 1.1
Guus Sliepen [Sun, 12 Apr 2015 13:35:50 +0000 (15:35 +0200)]
Merge remote-tracking branch 'dechamps/winmtu' into 1.1
Guus Sliepen [Sun, 12 Apr 2015 13:35:37 +0000 (15:35 +0200)]
Merge remote-tracking branch 'dechamps/fsckwin' into 1.1
Guus Sliepen [Sun, 12 Apr 2015 13:34:50 +0000 (15:34 +0200)]
Merge remote-tracking branch 'dechamps/staticfix' into 1.1
Etienne Dechamps [Sun, 15 Mar 2015 18:30:39 +0000 (18:30 +0000)]
Warn about performance if using TAP-Windows >=9.21.
Testing has revealed that the newer series of Windows TAP drivers (i.e.
9.0.0.21 and later, also known as NDIS6, tap-windows6) suffer from
serious performance issues in the write path. Write operations seems to
take a very long time to complete, resulting in massive packet loss even
for throughputs as low as 10 Mbit/s.
I've made some attempts to alleviate the problem using parellelism. By
using custom code that allows up to 256 write operations at the same
time the results are much better, but it's still about 2 times worse
than the traditional 9.0.0.9 driver.
We need to investigate more and file a bug against tap-windows6, but in
the mean time, let's inform the user that he might not want to use the
latest drivers.
Etienne Dechamps [Sun, 15 Mar 2015 18:18:04 +0000 (18:18 +0000)]
Log TAP-Windows driver version on startup.
This is generally useful. We've seen issues that are specific to some
version of these drivers (especially the newer 9.0.0.21 version), so
it's relevant to log it, especially since that means it will be
copy-pasted by people posting their logs asking for help.
Etienne Dechamps [Sun, 15 Mar 2015 18:01:03 +0000 (18:01 +0000)]
Increase the ReplayWindow default from 16 to 32.
As a rule, it seems reasonable to make sure that tinc operates correctly
on at least 1G links, since these are pretty common. However, I have
observed replay window issues when operating at speeds of 600 Mbit/s and
above, especially when the receiving end is a Windows system (not sure
why). This commit increases the default so that this won't occur on
fresh setups.
Etienne Dechamps [Sun, 15 Mar 2015 17:50:53 +0000 (17:50 +0000)]
Set the default for UDPRcvBuf and UDPSndBuf to 1M.
It may not be obvious, but due to the way tinc operates (single-threaded
control loop with no intermediate packet buffer), UDP send and receive
buffers can have a massive impact on performance. It is therefore of
paramount importance that the buffers be large enough to prevent packet
drops that could occur while tinc is processing a packet.
Leaving that value to the OS default could be reasonable if we weren't
relying on it so much. Instead, this makes performance somewhat
unpredictable.
In practice, the worst case scenario occurs on Windows, where Microsoft
had the brillant idea of making the buffers 8K in size by default, no
matter what the link speed is. Considering that 8K flies past in a
matter of microseconds on >1G links, this is extremely inappropriate. On
these systems, changing the buffer size to 1M results in *obscene*
raw throughput improvements; I have observed a 10X jump from 40 Mbit/s
to 400 Mbit/s on my system.
In this commit, we stop trusting the OS to get this right and we use a
fixed 1M value instead, which should be enough for <=1G links.
Etienne Dechamps [Sat, 14 Mar 2015 18:19:22 +0000 (18:19 +0000)]
Fix Windows device asynchronous write behavior.
Write operations to the Windows device do not necessarily complete
immediately; in fact, with the latest TAP-Win32 drivers, this never
seems to be the case.
write_packet() does not handle that case correctly, because the
OVERLAPPED structure and the packet data go out of scope before the
write operation completes, resulting in race conditions.
This commit fixes the issue by making sure these data structures are
kept in global scope, and by dropping any packets that may arrive while
the previous write operation is still pending.
Etienne Dechamps [Sat, 14 Mar 2015 17:27:14 +0000 (17:27 +0000)]
When disabling the Windows device, wait for pending reads to complete.
On Windows, when disabling the device, tinc uses the CancelIo() to
cancel the pending read operation, and then proceeds to delete the event
handle immediately.
This assumes that CancelIo() blocks until the pending read request is
completely torn down and no references to it remain. While MSDN is not
completely clear on that subject, it does suggest that this is not the
case:
http://msdn.microsoft.com/en-us/library/windows/desktop/
aa363791.aspx
If the function succeeds [...] the cancel operation for all pending
I/O operations issued by the calling thread for the specified file
handle was successfully requested.
This implies that cancellation was merely "requested", and that there
are no guarantees as to the state of the operation when CancelIo()
returns. Therefore, care must be taken not to close event handles
prematurely.
While I'm no aware of this potential race condition causing any problems
in practice, I don't want to take any chances.
Etienne Dechamps [Sun, 15 Mar 2015 10:00:56 +0000 (10:00 +0000)]
Make sure packet header structures are correctly packed on Windows.
Modern versions of GCC handle structure packing differently when
compiling for Windows, as reported in the following GCC bug report:
http://gcc.gnu.org/bugzilla/show_bug.cgi?id=52991
In practice, this affects tinc because it uses packed structs as a
convenient way to populate packet headers. "struct ip" is especially
affected - on Linux, sizeof(struct ip) returns 20 as expected, while on
Windows, it returns 24 because of the broken alignment.
This in turn completely breaks code that has to populate an IP header.
Specifically, this breaks route_ipv4_unreachable() which is responsible,
among other things, for the generation of ICMP Fragmentation Needed
messages. On Windows, these messages are corrupted beyond hope because
of this alignment issue. For TCP connections that are established
before tinc obtains a fix on the MTU (and thus are not MSS clamped),
this can result in massive disruption.
This commit fixes the issue by forcing GCC to use standard alignment
for all packed structures in the tinc codebase instead of the MSVC
alignment.
Etienne Dechamps [Sat, 14 Mar 2015 16:17:32 +0000 (16:17 +0000)]
Fix HAVE_DECL_RES_INIT conditionals.
HAVE_DECL_RES_INIT is generated using AC_CHECK_DECLS. tinc checks this
symbol using #ifdef, which is wrong because (according to autoconf docs)
the symbol is always defined, it's just set to zero if the check failed.
This broke the Windows build starting from
0b310bf406dbe58afe37fa31156b9ea47599d7be, because it introduced this
conditional in code that's not excluded from the Windows build.
Etienne Dechamps [Sat, 14 Mar 2015 16:07:54 +0000 (16:07 +0000)]
Fix invalid getuid() call on Windows.
This is breaking the Windows build. Regression was introduced in
268e3ffca7b45cfc736e1bc9bec7a113c6c45701.
Etienne Dechamps [Sat, 14 Mar 2015 14:04:50 +0000 (14:04 +0000)]
Don't send UDP probes past static relays.
Ironically, commit
0f8e2cc78cafe47a087d3fc9b480551b841aeb30 introduced
a regression on its own, since it accidently removed a return statement
that prevented try_tx_sptps() from sending UDP/MTU probes to nodes that
are past static relays.
Etienne Dechamps [Sun, 8 Mar 2015 20:17:27 +0000 (20:17 +0000)]
Throttle the rate of MTU_INFO messages.
This makes sure MTU_INFO messages are only sent at the maximum rate of
5 per second (by default). As usual with these "probe" mechanisms, the
rate of these messages cannot be higher than the rate of data packets
themselves, since they are sent from the RX path.