Etienne Dechamps [Sat, 30 Aug 2014 09:57:57 +0000 (10:57 +0100)]
Remove Google from the list of copyright owners.
Google released copyright to me for my own contributions.
William A. Kennington III [Mon, 25 Aug 2014 05:35:25 +0000 (22:35 -0700)]
tincctl: Use replace_name to properly replace and validate input hostnames
William A. Kennington III [Mon, 25 Aug 2014 04:55:42 +0000 (21:55 -0700)]
utils: Refactor check_id out of protocol for global access
William A. Kennington III [Mon, 25 Aug 2014 02:49:27 +0000 (19:49 -0700)]
utils: Refactor get_name's functionality into util for global access
Etienne Dechamps [Sun, 17 Aug 2014 19:22:44 +0000 (20:22 +0100)]
Clarify copyright ownership for code authored by Etienne Dechamps.
Sven-Haegar Koch [Thu, 7 Aug 2014 20:14:20 +0000 (22:14 +0200)]
commandline.test: Adding test that fetching non-existing config setting really fails.
Sven-Haegar Koch [Thu, 7 Aug 2014 21:01:05 +0000 (23:01 +0200)]
Fix exit code of "tinc get".
Successfully getting an existing variable ("tinc get name") should
not result in an error exitcode (1) from the tinc command.
This changes the result of test/commandline.test from FAIL to PASS.
Etienne Dechamps [Sat, 19 Jul 2014 17:11:42 +0000 (18:11 +0100)]
Handle TAP-Win32 immediate reads correctly.
The handling of TAP-Win32 virtual network device reads that complete
immediately (ReadFile() returns TRUE) is incorrect - instead of
starting a new read, tinc will continue listening for the overlapped
read completion event which will never fire. As a result, tinc stops
receiving packets on the interface.
Etienne Dechamps [Sat, 19 Jul 2014 15:05:23 +0000 (16:05 +0100)]
Only read from TAP-Win32 if the device is enabled.
With newer TAP-Win32 versions (such as the experimental
tap-windows6 9.21.0), tinc is unable to read from the virtual network
device:
Error while reading from (null) {
23810A13-BCA9-44CE-94C6-
9AEDFBF85736}: No such file or directory
This is because these new drivers apparently don't accept reads when
the device is not in the connected state (media status).
This commit fixes the issue by making sure we start reading no sooner
than when the device is enabled, and that we stop reading when the
device is disabled. This also makes the behavior somewhat cleaner,
because it doesn't make much sense to read from a disabled device
anyway.
Etienne Dechamps [Sun, 13 Jul 2014 14:54:34 +0000 (15:54 +0100)]
Add a non-interactive mode to tinc commands.
Some tinc commands, such as "tinc generate-keys", use the terminal to
ask the user for information. This can be bypassed by making sure
there is no terminal, which is trivial on *nix but might require
jumping through some hoops on Windows depending on how the command is
invoked.
This commit adds a --batch option that ensures tinc will never ask the
user for input, even if it is attached to a terminal.
Guus Sliepen [Sat, 12 Jul 2014 20:51:37 +0000 (22:51 +0200)]
Revert "Use git description as the tinc version."
This reverts commit
e024b7a2c50e23311834e6d180e5acc72783b339. Automatic version
number generation needs a little bit more work to get it working correctly in
all cases.
Guus Sliepen [Sat, 12 Jul 2014 20:25:55 +0000 (22:25 +0200)]
Merge branch 'keysegfault' of https://github.com/dechamps/tinc into 1.1
Guus Sliepen [Sat, 12 Jul 2014 20:22:31 +0000 (22:22 +0200)]
Merge branch 'tincstart' of https://github.com/dechamps/tinc into 1.1
Guus Sliepen [Sat, 12 Jul 2014 20:21:01 +0000 (22:21 +0200)]
Merge branch 'ctrl' of https://github.com/dechamps/tinc into 1.1
Guus Sliepen [Sat, 12 Jul 2014 20:19:45 +0000 (22:19 +0200)]
Merge branch 'winwarnings' of https://github.com/dechamps/tinc into 1.1
Etienne Dechamps [Mon, 30 Jun 2014 13:03:17 +0000 (14:03 +0100)]
Verify seqno early in sptps_verify_datagram().
This is a slight optimization for sptps_verify_datagram(), which might
come in handy since this function is called in a loop via try_harder().
It turns out that since sptps_verify_datagram() doesn't update any
state, it doesn't matter in which order verifications are done. However,
it does affect performance since it's much cheaper to check the seqno
than to try to decrypt the packet.
Since this function is called with the wrong node most of the time, it
makes verification vastly faster for the majority of calls because the
seqno will be wrong in most cases.
Etienne Dechamps [Sun, 6 Jul 2014 10:34:57 +0000 (11:34 +0100)]
Add documentation about using system-assigned ports.
There are two caveats to be aware of which are documented in this
commit:
- Because the system will likely assign different ports when binding
several times to different address families, it is recommended to
only use a single address family, otherwise other nodes will only
get one port among the several that were assigned, possibly breaking
communication.
- AutoConnect won't work in this scenario, because it relies on the UDP
port being the same as the TCP port, which is not the case when using
system-assigned ports.
Etienne Dechamps [Sat, 12 Jul 2014 17:53:25 +0000 (18:53 +0100)]
Improve subprocess behavior in tinc start command.
When invoking tincd, tinc start currently uses the execvp() function,
which doesn't behave well in a console as the console displays a new
prompt before the subprocess finishes (which makes me suspect the exit
value is not handled at all). This new code uses spawnvp() instead,
which seems like a better fit.
Etienne Dechamps [Sat, 12 Jul 2014 17:37:56 +0000 (18:37 +0100)]
Fix "tinc start" on Windows when the path contains spaces.
When invoking "tinc start" with spaces in the path, the following
happens:
> "c:\Program Files (x86)\tinc\tinc.exe" start
c:\Program: unrecognized argument 'Files'
Try `c:\Program --help' for more information.
This is caused by inconsistent handling of command line strings between
execvp() and the spawned process' CRT, as documented on MSDN:
http://msdn.microsoft.com/library/431x4c1w.aspx
Etienne Dechamps [Sat, 12 Jul 2014 16:47:01 +0000 (17:47 +0100)]
Shutdown cleanly when receiving a Windows console shutdown request.
This commit makes tinc exit cleanly on Windows when hitting CTRL+C at
the console or when the user logs off. This change has no effect when
running tinc as a service.
Etienne Dechamps [Sat, 12 Jul 2014 12:56:01 +0000 (13:56 +0100)]
Check if devops is valid before closing the device.
This fixes a segfault that occurs on exit if tinc fails before the
device is initialized (for example, if it fails to read the private
key).
Guus Sliepen [Sat, 12 Jul 2014 12:35:29 +0000 (14:35 +0200)]
Fix unsafe use of strncpy() and sprintf().
The strncpy() problem was found by cppcheck.
Guus Sliepen [Sat, 12 Jul 2014 12:34:39 +0000 (14:34 +0200)]
Fix a potential file descriptor leak.
Found by cppcheck.
Etienne Dechamps [Sat, 12 Jul 2014 12:32:23 +0000 (13:32 +0100)]
Resolve KEY_EVENT conflict between Windows and ncurses.
This fixes the following compiler warning when building for Windows:
In file included from top.c:24:0:
/usr/local/mingw/ncurses/include/curses.h:1478:0: error: "KEY_EVENT" redefined [-Werror]
#define KEY_EVENT 0633 /* We were interrupted by an event */
^
In file included from /usr/share/mingw-w64/include/windows.h:74:0,
from /usr/share/mingw-w64/include/winsock2.h:23,
from have.h:46,
from system.h:26,
from top.c:20:
/usr/share/mingw-w64/include/wincon.h:101:0: note: this is the location of the previous definition
#define KEY_EVENT 0x1
^
Etienne Dechamps [Sat, 12 Jul 2014 12:27:05 +0000 (13:27 +0100)]
Remove unused device stats variables.
This removes a bunch of variables that are never actually used anywhere.
This fixes the following compiler warning when building for Windows:
mingw/device.c:46:17: error: ‘device_total_in’ defined but not used [-Werror=unused-variable]
static uint64_t device_total_in = 0;
^
Etienne Dechamps [Sat, 12 Jul 2014 11:57:11 +0000 (12:57 +0100)]
Remove unused variable in TAP-Win32 setup_device().
This fixes the following compiler warning when building for Windows:
mingw/device.c: In function ‘setup_device’:
mingw/device.c:92:9: error: unused variable ‘thread’ [-Werror=unused-variable]
HANDLE thread;
^
Etienne Dechamps [Sat, 12 Jul 2014 11:54:45 +0000 (12:54 +0100)]
Fix callback signature for TAP-Win32 device_handle_read().
This fixes the following compiler warning when building for Windows:
mingw/device.c: In function ‘setup_device’:
mingw/device.c:186:2: error: passing argument 2 of ‘io_add_event’ from incompatible pointer type [-Werror]
io_add_event(&device_read_io, device_handle_read, NULL, CreateEvent(NULL, TRUE, FALSE, NULL));
^
In file included from mingw/../net.h:27:0,
from mingw/../subnet.h:24,
from mingw/../conf.h:34,
from mingw/device.c:26:
mingw/../event.h:61:13: note: expected ‘io_cb_t’ but argument is of type ‘void (*)(void *)’
extern void io_add_event(io_t *io, io_cb_t cb, void* data, WSAEVENT event);
Etienne Dechamps [Sat, 12 Jul 2014 11:52:25 +0000 (12:52 +0100)]
Remove an unnecessary pointer dereference in execute_script().
This fixes the following compiler warning when building for Windows:
script.c: In function ‘execute_script’:
script.c:52:5: error: value computed is not used [-Werror=unused-value]
*q++;
^
Etienne Dechamps [Sat, 12 Jul 2014 11:49:59 +0000 (12:49 +0100)]
Only declare the origpriority variable if we support priority.
This fixes the following compiler warning when building for Windows:
net_packet.c: In function ‘send_udppacket’:
net_packet.c:633:6: error: unused variable ‘origpriority’ [-Werror=unused-variable]
int origpriority = origpkt->priority;
^
Guus Sliepen [Sat, 12 Jul 2014 12:24:16 +0000 (14:24 +0200)]
Reserve legacy active bit in connection_status_t.
This is so the positions of the other bits don't change, making it easier to
debug problems with different versions of tinc.
Also fix the padding so connection_status_t is exactly 32 bits.
Etienne Dechamps [Sat, 12 Jul 2014 10:57:03 +0000 (11:57 +0100)]
Remove redundant connection_t::status.active field.
The only places where connection_t::status.active is modified is in
ack_h() and terminate_connection(). In both cases, connection_t::edge
is added and removed at the same time, and that's the only places
connection_t::edge is set. Therefore, the following is true at all
times:
!c->status.active == !c->edge
This commit removes the redundant state information by getting rid of
connection_t::status.active, and using connection_t::edge instead.
Etienne Dechamps [Sat, 12 Jul 2014 10:13:04 +0000 (11:13 +0100)]
Don't initialize outpkt to an unused value.
in receive_udppacket(), we initialize outpkt to a default value but the
value is never read anywhere, as every read is preceded by a write.
This issue was found by the clang static analyzer tool:
http://clang-analyzer.llvm.org/
Etienne Dechamps [Sat, 12 Jul 2014 10:06:36 +0000 (11:06 +0100)]
Handle the "no local address" case in send_sptps_data().
If choose_local_address() is unable to find a local address (e.g.
because of old nodes that don't send their local address information),
then send_sptps_data() ends up using uninitialized variables for the
socket and address.
This regression was introduced in
415910897122da0073a862784d148802ca390020. The commit took care of
handling that case in send_udppacket() but was missing the same fix
for send_sptps_data().
This bug was found by the clang static analyzer tool:
http://clang-analyzer.llvm.org/
Guus Sliepen [Thu, 10 Jul 2014 20:41:01 +0000 (22:41 +0200)]
Fix incorrect format qualifiers.
Based on a patch from Etienne Dechamps. We avoid the use of %hhx, since even
though it is C99, not all compilers support it yet. We use %x instead, since
it's guaranteed that the minimum size of function arguments on the stack or in
registers is that of an int.
Etienne Dechamps [Thu, 10 Jul 2014 19:29:12 +0000 (20:29 +0100)]
Fix a typo (FORTIFY_SOURCE).
Baptiste Jonglez [Sun, 6 Jul 2014 11:55:26 +0000 (20:55 +0900)]
Fix typos in the manual page
Guus Sliepen [Tue, 8 Jul 2014 12:20:11 +0000 (14:20 +0200)]
Fix segmentation fault when dumping subnets.
Guus Sliepen [Tue, 8 Jul 2014 12:20:01 +0000 (14:20 +0200)]
Fix compiler warnings.
Etienne Dechamps [Sun, 6 Jul 2014 11:35:32 +0000 (12:35 +0100)]
Fix event loop io tree inconsistency on Windows.
On Windows, the event loop io tree uses the Windows Event handle to
differentiate between io_t objects. Unfortunately, there is a bug in
the io_add_event() function (introduced in
2f9a1d4ab5ff51b05a5e8cc41a1528fdeb36c723) as it sets the event after
inserting the object into the tree, resulting in objects appearing in
io_tree out of order.
This can lead to crashes on Windows as the event loop is unable to
determine which events fired.
Etienne Dechamps [Sun, 6 Jul 2014 09:55:23 +0000 (10:55 +0100)]
Make sure myport is set correctly when running with Port = 0.
Setting the Port configuration variable to zero can be used to make tinc
listen on a system-assigned port. Unfortunately, in this scenario myport
will be zero, which means that tinc won't transmit its actual UDP
listening port to other nodes. This breaks UDP hole punching and local
discovery.
Etienne Dechamps [Fri, 4 Jul 2014 23:23:05 +0000 (00:23 +0100)]
Fix tinc event loop reentrancy from timeout handlers.
Commit
611217c96ec684799882cf330f40a0936131b6b5 introduced a regression
because it accidentally reordered the timeout handler calls and the
fdset setup code. This means that any io_add(), io_del() or io_set()
calls in timeout handlers would be ignored in the current event loop
iteration, resulting in erratic behavior.
The most visible symptom is when a metaconnection timeout occurs and the
connection is closed; the timeout handler closes the socket but it still
ends up in the select() call, typically resulting in the following
crash:
Error while waiting for input: Bad file descriptor
Etienne Dechamps [Sat, 5 Jul 2014 18:51:19 +0000 (19:51 +0100)]
Canonicalize IPv6 addresses as per RFC 5952 before printing them.
Currently we don't do any shortening on IPv6 addresses (aside from
removing trailing zeroes) before printing them. This commit makes
textual addresses smaller by shortening them according to the rules
described in RFC 5952. This is also the canonical textual representation
for IPv6 addresses, thus making them easier to compare.
Etienne Dechamps [Sat, 5 Jul 2014 18:02:02 +0000 (19:02 +0100)]
Don't print subnet prefix lengths and weights for one-host subnets.
This commit suppresses subnet prefix length output (/xx) for subnets
that only contain one address (/32 for IPv4, /128 for IPv6). It also
suppresses weight information if the subnet is using the default
weight. This improves readability of net2str() output in the majority
of cases.
Etienne Dechamps [Sat, 5 Jul 2014 17:52:03 +0000 (18:52 +0100)]
When printing MAC addresses, always use trailing zeroes.
tinc currently prints MAC addresses without trailing zeroes, for example:
1:2:3:4:5:6
This looks weird and is inconsistent with how MAC addresses are
displayed everywhere else. This commit adds trailing zeroes, so the
above address will be printed as the following:
01:02:03:04:05:06
Etienne Dechamps [Sat, 5 Jul 2014 17:05:55 +0000 (18:05 +0100)]
Rewrite, fix and improve str2net().
This is a complete rewrite of the str2net() function. Besides
refactoring duplicate code, this new code brings the following fixes
and improvements:
- Fixes handling of leading/trailing double colon in IPv6 addresses.
For example, with the previous code the address
2001:0db8:85a3:0000:0000:8a2e:0370:: is interpreted as a MAC address,
and ::0db8:85a3:0000:0000:8a2e:0370:7334 is rejected.
- Catches more invalid cases, such as garbage at the end of the string.
- Adds support for dotted quad notation in IPv6 (e.g. ::1.2.3.4).
See RFC 4291, section 2.2 for details on the textual format of IPv6
addresses.
Etienne Dechamps [Sun, 29 Jun 2014 14:22:10 +0000 (15:22 +0100)]
Use git description as the tinc version.
Instead of using a 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 provides several advantages:
- Less redundancy: git is now the source of truth for version
information, no need to store it in the repository itself.
- Simpler release process: just creating a git tag automatically
updates the version. No need to change files.
- More useful version information: 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 would 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")
Etienne Dechamps [Sun, 29 Jun 2014 13:57:42 +0000 (14:57 +0100)]
Regenerate build date and time every time tinc is built.
This prevents the date and time shown in version information from
getting stale because of partial builds. With these changes, date and
time information is written to a dedicated object file that gets rebuilt
every time make is run, even if there are no changes.
Etienne Dechamps [Sun, 29 Jun 2014 13:15:58 +0000 (14:15 +0100)]
Make IPv4 multicast space 224.0.0.0/4 broadcast by default.
We already do this for IPv6 multicast space (ff00::/8), so why not
extend it to IPv4.
Etienne Dechamps [Sun, 29 Jun 2014 12:18:25 +0000 (13:18 +0100)]
Make broadcast addresses configurable.
This adds a new option, BroadcastSubnet, that allows the user to
declare broadcast subnets, i.e. subnets which are considered broadcast
addresses by the tinc routing layer. Previously only the global IPv4
and IPv6 broadcast addresses were supported by virtue of being
hardcoded.
This is useful when using tinc in router mode with Ethernet virtual
devices, as it can be used to provide broadcast support for a local
broadcast address (e.g. 10.42.255.255) instead of just the global
address (255.255.255.255).
This is implemented by removing hardcoded broadcast addresses and
introducing "broadcast subnets", which are subnets with a NULL owner.
By default, behavior is unchanged; this is accomplished by adding
the global broadcast addresses for Ethernet, IPv4 and IPv6 at start
time.
Etienne Dechamps [Sun, 29 Jun 2014 08:57:11 +0000 (09:57 +0100)]
Implement sptps_verify_datagram().
Implementation of sptps_verify_datagram() was left as a TODO. This
causes problems when using SPTPS in tinc, because this function is
used in try_mac(), which itself is used in try_harder() to locate
nodes sending UDP packets from unexpected addresses. In the current
state this function always returns true, resulting in UDP addresses
of random nodes getting changed which makes UDP communication
fragile and unreliable. In addition, this makes UDP communication
impossible through port translation and local discovery.
This commit adds the missing implementation, thus fixing the issue.
Etienne Dechamps [Sun, 29 Jun 2014 10:06:44 +0000 (11:06 +0100)]
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.
Etienne Dechamps [Sun, 29 Jun 2014 10:01:24 +0000 (11:01 +0100)]
Remove broadcast-based local discovery mechanism.
The new local address based local discovery mechanism is technically
superior to the old broadcast-based one. In fact, the old algorithm
can technically make things worse by e.g. sending broadcasts over the
VPN itself and then selecting the VPN address as the node's UDP
address. This cannot happen with the new mechanism.
Note that this means old nodes that don't send their local addresses in
ADD_EDGE messages can't be discovered, because there is no address to
send discovery packets to. Old nodes can still discover new nodes by
sending them broadcasts, though.
Etienne Dechamps [Sun, 22 Jun 2014 16:27:55 +0000 (17:27 +0100)]
Use edge local addresses for local discovery.
This introduces a new way of doing local discovery: when tinc has
local address information for the recipient node, it will send local
discovery packets directly to the local address of that node, instead
of using broadcast packets.
This new way of doing local discovery provides numerous advantages compared to
using broadcasts:
- No broadcast packets "polluting" the local network;
- Reliable even if the sending host has multiple network interfaces (in
contrast, broadcasts will only be sent through one unpredictable
interface)
- Works even if the two hosts are not on the same broadcast domain. One
example is a large LAN where the two hosts might be on different local
subnets. In fact, thanks to UDP hole punching this might even work if
there is a NAT sitting in the middle of the LAN between the two nodes!
- Sometimes a node is reachable through its "normal" address, and via a
local subnet as well. One might think the local subnet is the best route
to the node in this case, but more often than not it's actually worse -
one example is where the local segment is a third party VPN running in
parallel, or ironically it can be the local segment formed by the tinc
VPN itself! Because this new algorithm only checks the addresses for
which an edge is already established, it is less likely to fall into
these traps.
Etienne Dechamps [Sun, 22 Jun 2014 15:29:30 +0000 (16:29 +0100)]
Add local address information to edges.
In addition to the remote address, each edge now stores the local address from
the point of view of the "from" node. This information is then made available
to other nodes through a backwards-compatible extension to ADD_EDGE messages.
This information can be used in future code to improve packet routing.
Guus Sliepen [Sat, 28 Jun 2014 19:54:34 +0000 (21:54 +0200)]
Give getsockopt() a reference to a socklen_t.
Guus Sliepen [Sat, 28 Jun 2014 19:49:55 +0000 (21:49 +0200)]
Merge branch 'winevents-clean' of https://github.com/dechamps/tinc into 1.1
Etienne Dechamps [Sat, 28 Jun 2014 17:39:00 +0000 (18:39 +0100)]
Remove the TAP-Win32 reader thread.
tinc is using a separate thread to read from the TAP device on Windows.
The rationale was that the notification mechanism for packets arriving
on the virtual network device is based on Win32 events, and the event
loop did not support listening to these events.
Thanks to recent improvements, this event loop limitation has been
lifted. Therefore we can get rid of the separate thread and simply add
the Win32 "incoming packet" event to the event loop, just like a socket.
The result is cleaner code that's easier to reason about.
Etienne Dechamps [Sat, 28 Jun 2014 14:19:11 +0000 (15:19 +0100)]
Use a Windows event to stop tinc when running as a service.
Currently, when the tinc service handler callback (which runs in a
separate thread) receives a service shutdown request, it calls
event_exit() to request the event loop to exit.
This approach has a few issues:
- The event loop will only notice the exit request when the next event
fires. This slows down tinc service shutdown. In some extreme cases
(DeviceStandby enabled, long PingTimeout and no connections),
shutdown can take ages.
- Strictly speaking, because of the absence of memory barriers, there
is no guarantee that the event loop will even notice an exit request
coming from another thread. I suppose marking the "running" variable
as "volatile" is supposed to alleviate that, but it's unclear whether
that provides any guarantees with modern systems and compilers.
This commit fixes the issue by leveraging the new event loop Windows
interface, using a custom Windows event that is manually set when
shutdown is requested.
Etienne Dechamps [Sat, 28 Jun 2014 14:15:41 +0000 (15:15 +0100)]
Make the event loop expose a Windows event interface.
This allows event loop users to specify Win32 events to wait on,
thus making the event loop more flexible.
Etienne Dechamps [Fri, 27 Jun 2014 20:58:35 +0000 (21:58 +0100)]
Use native Windows events for the event loop.
This commit changes the event loop to use WSAEventSelect() and
WSAWaitForMultipleEvents() on Windows. This paves the way for making the
event loop more flexible on Windows by introducing the required
infrastructure to make the event loop wait on any Win32 event.
This commit only affects the internal implementation of the event
module. Externally visible behavior remains strictly unchanged (for
now).
Etienne Dechamps [Sat, 28 Jun 2014 10:13:29 +0000 (11:13 +0100)]
Fix connection event error handling.
Commit
86a99c6b999671ed444711139db1937617e802a0 changed the way we
handle connection events to protect against spurious event loop
callbacks. Unfortunately, it turns out that calling connect() twice on
the same socket results in different behaviors depending on the platform
(even though it seems well defined in POSIX). On Windows this resulted
in the connection handling code being unable to react to connection
errors (such as connection refused), always hitting the timeout; on
Linux this resulted in spurious error messages about connect() returning
success.
In POSIX and on Linux, using connect() on a socket where the previous
attempt failed will attempt to connect again, resulting in unnecessary
network activity. Using getsockopt(SO_ERROR) before connect() solves
that, but introduces a race condition if a connection failure happens
between the two calls.
For this reason, this commit switches from connect() to a zero-sized
send() call, which is more consistent (though not completely, see the
truth table in the comments) and simpler to use for that purpose. Note
that Windows explictly support empty send() calls; POSIX says nothing
on the subject, but testing shows it works at least on Linux.
(Surprisingly enough, Windows seems more POSIX-compliant than Linux on
this one!)
Etienne Dechamps [Fri, 27 Jun 2014 18:33:31 +0000 (19:33 +0100)]
Protect against spurious connection events.
The event loop does not guarantee that spurious write I/O events do not
happen; in fact, they are guaranteed to happen on Windows when
event_flush_output() is called. Because handle_meta_io() does not check
for spurious events, a metaconnection socket might appear connected even
though it's not, and will fail immediately when sending the ID request.
This commit fixes this issue by making handle_meta_io() check the
connection status before assuming the socket is connected. It seems that
the only reliable way to do that is to try to call connect() again and
look at the error code, which will be EISCONN if the socket is
connected, or EALREADY if it's not.
Etienne Dechamps [Thu, 26 Jun 2014 19:42:40 +0000 (20:42 +0100)]
Fix errno references when handling socket errors.
When using socket functions, "sockerrno" is supposed to be used to
retrieve the error code as opposed to "errno", so that it is translated
to the correct call on Windows (WSAGetLastError() - Windows does not
update errno on socket errors). Unfortunately, the use of sockerrno is
inconsistent throughout the tinc codebase, as errno is often used
incorrectly on socket-related calls.
This commit fixes these oversights, which improves socket error
handling on Windows.
Etienne Dechamps [Sun, 22 Jun 2014 17:45:49 +0000 (18:45 +0100)]
Fix Windows includes.
These Windows include lines are capitalized, which causes the build to fail
when cross-compiling from Linux to Windows using MinGW as the MinGW headers
are entirely lower case.
Guus Sliepen [Sun, 11 May 2014 15:11:02 +0000 (17:11 +0200)]
Remove the warnings when IP_DONTFRAGMENT/IPV6-DONTFRAG is not supported.
There is nothing we can do about it, and tinc will run fine anyway.
Alexis Hildebrandt [Sun, 22 Jun 2014 14:43:15 +0000 (16:43 +0200)]
Add support to link against libresolv Mac OS X
Armin Fisslthaler [Fri, 25 Apr 2014 12:44:06 +0000 (14:44 +0200)]
reload /etc/resolv.conf in SIGALRM handler
Etienne Dechamps [Sun, 22 Jun 2014 09:48:34 +0000 (10:48 +0100)]
Make DeviceStandby control network interface link status on Windows.
Besides controlling when tinc-up and tinc-down get called, this commit makes
DeviceStandby control when the virtual network interface "cable" is "plugged"
on Windows. This is more user-friendly as the status of the tinc network can
be seen just by looking at the state of the network interface, and it makes
Windows behave better when isolated.
Etienne Dechamps [Sun, 22 Jun 2014 09:48:34 +0000 (10:48 +0100)]
Add DeviceStandby option to only enable the device when nodes are reachable.
This adds a new DeviceStandby option; when it is disabled (the default),
behavior is unchanged. If it is enabled, tinc-up will not be called during
tinc initialization, but will instead be deferred until the first node is
reachable, and it will be closed as soon as no nodes are reachable.
This is useful because it means the device won't be set up until we are fairly
sure there is something listening on the other side. This is more user-friendly,
as one can check on the status of the tinc network connection just by checking
the status of the network interface. Besides, it prevents the OS from thinking
it is connected to some network when it is in fact completely isolated.
Etienne Dechamps [Sun, 22 Jun 2014 13:06:44 +0000 (14:06 +0100)]
Cleanly remove the device FD from the event loop before closing it.
Etienne Dechamps [Sun, 22 Jun 2014 08:53:26 +0000 (09:53 +0100)]
Make device close cleaner.
Etienne Dechamps [Sun, 22 Jun 2014 08:54:45 +0000 (09:54 +0100)]
Move Solaris if_fd to local scope.
This variable is never used outside of setup_device(), therefore there is no
reason to declare it in global scope.
Baptiste Jonglez [Fri, 20 Jun 2014 06:56:13 +0000 (15:56 +0900)]
Clarify man page regarding the IndirectData option
Guus Sliepen [Sun, 15 Jun 2014 10:19:10 +0000 (12:19 +0200)]
Unconditionally return non-zero exit code when "tinc del" does not find the requested variable.
Guus Sliepen [Sun, 15 Jun 2014 10:14:01 +0000 (12:14 +0200)]
Return non-zero exit code when "tinc get" does not find the requested variable.
Guus Sliepen [Tue, 3 Jun 2014 09:02:58 +0000 (11:02 +0200)]
Fix base64 decoding of
Ed25519 keys.
Guus Sliepen [Sun, 18 May 2014 19:51:42 +0000 (21:51 +0200)]
Allow Cipher and Digest "none".
This is for backwards compatibility with tinc 1.0, it has no effect on
the SPTPS protocol.
Guus Sliepen [Sun, 18 May 2014 18:49:35 +0000 (20:49 +0200)]
Implement a PEM-like format for
Ed25519 keys.
We don't require compatibility with any other software, but we do want
Ed25519 keys to work
the same as RSA keys for now.
Guus Sliepen [Sun, 18 May 2014 18:47:04 +0000 (20:47 +0200)]
Guus Sliepen [Tue, 13 May 2014 18:29:09 +0000 (20:29 +0200)]
Add sanity checks when generating new RSA keys.
The key size should be a multiple of 8 bits, and it should be between 1024 and
8192 bits.
Guus Sliepen [Mon, 12 May 2014 13:57:40 +0000 (15:57 +0200)]
Fix PMTU discovery via datagram SPTPS.
In send_sptps_data(), the len variable contains the length of the whole
datagram that needs to be sent to the peer, including the overhead from SPTPS
itself.
Guus Sliepen [Mon, 12 May 2014 13:56:29 +0000 (15:56 +0200)]
Fix a crash when we have a malformed public ECDSA key of another node.
Guus Sliepen [Mon, 12 May 2014 12:35:56 +0000 (14:35 +0200)]
Add missing closedir().
Guus Sliepen [Mon, 12 May 2014 12:35:12 +0000 (14:35 +0200)]
Use void pointers to opaque buffers.
Guus Sliepen [Tue, 6 May 2014 12:11:55 +0000 (14:11 +0200)]
Change AutoConnect from int to bool.
The proper value is 3, not 2 or 4, and 5 is right out. So just hardcode this value,
and only have the option to turn AutoConnect on or off.
Guus Sliepen [Tue, 6 May 2014 11:01:48 +0000 (13:01 +0200)]
Fix compiler warnings.
Guus Sliepen [Tue, 6 May 2014 10:58:25 +0000 (12:58 +0200)]
Nexthop calculation should always use the shortest path.
When tinc runs the graph algorithms and updates the nexthop and via pointers,
it uses a breadth-first search, but it can sometimes revisit nodes that have
already been visited if the previous path is marked as being indirect, and
there is a longer path that is "direct". The via pointer should be updated in
this case, because this points to the closest hop to the destination that can
be reached directly. However, the nexthop pointer should not be updated.
This fixes a bug where there could potentially be a routing loop if a node in
the graph has an edge with the indirect flag set, and some other edge without
that flag, the indirect edge is part of the minimum spanning tree, and a
broadcast packet is being sent.
Saverio Proto [Mon, 5 May 2014 13:23:25 +0000 (15:23 +0200)]
Fix typo in comment
Guus Sliepen [Fri, 25 Apr 2014 15:00:55 +0000 (17:00 +0200)]
Put brackets around IPv6 addresses in invitation URL, even if there is no port number.
Guus Sliepen [Tue, 15 Apr 2014 15:26:08 +0000 (17:26 +0200)]
sptps_test: allow using a tun device instead of stdio.
Guus Sliepen [Mon, 14 Apr 2014 19:43:45 +0000 (21:43 +0200)]
Use the ChaCha-Poly1305 cipher for the SPTPS protocol.
The main reason to switch from AES-256-GCM to ChaCha-Poly1305 is to remove a
dependency on OpenSSL, whose behaviour of the AES-256-GCM decryption function
changes between versions. The source code for ChaCha-Pol1305 is small and in
the public domain, and can therefore be easily included in tinc itself.
Moreover, it is very fast even without using any optimized assembler, easily
outperforming AES-256-GCM on platforms that don't have special AES instructions
in hardware.
Guus Sliepen [Mon, 14 Apr 2014 18:49:43 +0000 (20:49 +0200)]
Merge branch '1.1-
ed25519' into 1.1
Guus Sliepen [Sun, 13 Apr 2014 10:09:48 +0000 (12:09 +0200)]
Properly initialize buffers.
Valgrind complained about use of uninitialized data.
Guus Sliepen [Sun, 6 Apr 2014 20:47:26 +0000 (22:47 +0200)]
Use
Ed25519 keys.
This uses the portable
Ed25519 library made by Orson Peters, which in turn uses
the reference implementation made by Daniel J. Bernstein.
This implementation also allows
Ed25519 keys to be used for key exchange, so
there is no need to add a separate implementation of Curve25519.
Guus Sliepen [Sun, 6 Apr 2014 20:46:06 +0000 (22:46 +0200)]
Fix return value of b64encode().
Guus Sliepen [Sun, 9 Mar 2014 14:32:10 +0000 (15:32 +0100)]
Handle a disconnecting tincd better.
- Try to prevent SIGPIPE from being sent for errors sending to the control
socket. We don't outright block the SIGPIPE signal because we still want the
tinc CLI to exit when its output is actually sent to a real (broken) pipe.
- Don't call exit() from top(), and properly detect when the control socket is
closed by the tincd.
Guus Sliepen [Wed, 26 Feb 2014 16:27:57 +0000 (17:27 +0100)]
Rewind the file before trying to use PEM_read_RSA_PUBKEY().
Guus Sliepen [Wed, 26 Feb 2014 10:00:30 +0000 (11:00 +0100)]
Add "network" command to list or switch networks.
Guus Sliepen [Fri, 7 Feb 2014 22:06:26 +0000 (23:06 +0100)]
Add missing attribution for 1.1pre10 to the NEWS file.
Guus Sliepen [Fri, 7 Feb 2014 22:05:33 +0000 (23:05 +0100)]
Really fix compiling under Windows.