7 years agoAdd missing brainpool.h. 1.1-brainpool
Guus Sliepen [Sun, 15 Sep 2013 21:26:40 +0000 (23:26 +0200)]
Add missing brainpool.h.

7 years agoAdd the brainpoolp512r1 curve and use it.
Guus Sliepen [Sun, 15 Sep 2013 14:22:34 +0000 (16:22 +0200)]
Add the brainpoolp512r1 curve and use it.

7 years agoLink sptps_speed with -lrt.
Guus Sliepen [Sun, 15 Sep 2013 20:03:00 +0000 (22:03 +0200)]
Link sptps_speed with -lrt.

This is necessary for clock_gettime() on older versions of libc.

7 years agoDon't leak memory during the key generation speed test.
Guus Sliepen [Sun, 15 Sep 2013 20:02:33 +0000 (22:02 +0200)]
Don't leak memory during the key generation speed test.

7 years agoAdd a benchmark for the SPTPS protocol.
Guus Sliepen [Sun, 15 Sep 2013 15:35:55 +0000 (17:35 +0200)]
Add a benchmark for the SPTPS protocol.

7 years agoAvoid using BIOs.
Guus Sliepen [Sun, 15 Sep 2013 14:21:25 +0000 (16:21 +0200)]
Avoid using BIOs.

7 years agoWrong date for the 1.1pre9 release in the NEWS.
Guus Sliepen [Sun, 15 Sep 2013 11:36:53 +0000 (13:36 +0200)]
Wrong date for the 1.1pre9 release in the NEWS.

7 years agoReleasing 1.1pre9. release-1.1pre9
Guus Sliepen [Sun, 8 Sep 2013 15:29:12 +0000 (17:29 +0200)]
Releasing 1.1pre9.

7 years agoDon't try to mkdir(CONFDIR) if --config is used.
Guus Sliepen [Sun, 8 Sep 2013 13:03:06 +0000 (15:03 +0200)]
Don't try to mkdir(CONFDIR) if --config is used.

7 years agoMake sure test scripts end up in the tarball.
Guus Sliepen [Sun, 8 Sep 2013 12:47:59 +0000 (14:47 +0200)]
Make sure test scripts end up in the tarball.

7 years agoAutomake doesn't like info files being mentioned in CLEANFILES.
Guus Sliepen [Sun, 8 Sep 2013 12:42:32 +0000 (14:42 +0200)]
Automake doesn't like info files being mentioned in CLEANFILES.

7 years agoTest running ping through two tinc daemons.
Guus Sliepen [Thu, 5 Sep 2013 15:42:31 +0000 (17:42 +0200)]
Test running ping through two tinc daemons.

This is a more complicated test with one tinc daemon using a tap interface
(therefore requiring root), and a second one using a multicast interface. A
separate program "pong" is listening on the same multicast address, and waits
for ARP and ICMP packets, responding to ICMP echo packets with replies.
This test doesn't require any configuration of the tap interface.

7 years agoDon't return zero-length packets when receiving multicast loopback packets.
Guus Sliepen [Thu, 5 Sep 2013 15:41:05 +0000 (17:41 +0200)]
Don't return zero-length packets when receiving multicast loopback packets.

7 years agoAdd two more test scripts.
Guus Sliepen [Thu, 5 Sep 2013 12:59:56 +0000 (14:59 +0200)]
Add two more test scripts.

7 years agoFix multicast device.
Guus Sliepen [Thu, 5 Sep 2013 12:51:13 +0000 (14:51 +0200)]
Fix multicast device.

7 years agoExit value 1 instead of a random non-zero value.
Guus Sliepen [Thu, 5 Sep 2013 12:50:10 +0000 (14:50 +0200)]
Exit value 1 instead of a random non-zero value.

7 years agoAdd a test for invite and join commands.
Guus Sliepen [Sun, 1 Sep 2013 22:15:50 +0000 (00:15 +0200)]
Add a test for invite and join commands.

7 years agoAlso test whether tinc daemons can connect to each other after import/export.
Guus Sliepen [Sun, 1 Sep 2013 22:15:18 +0000 (00:15 +0200)]
Also test whether tinc daemons can connect to each other after import/export.

7 years agoSlightly relax the connection rate limit for a single address.
Guus Sliepen [Sun, 1 Sep 2013 22:11:04 +0000 (00:11 +0200)]
Slightly relax the connection rate limit for a single address.

The restriction of accepting only 1 connection per second from a single address
is a bit too much, especially if one wants to join a VPN using an invitation,
which requires two connections.

7 years agoSend a RELOAD to a running tincd when a new invitation key has been generated.
Guus Sliepen [Sun, 1 Sep 2013 20:59:51 +0000 (22:59 +0200)]
Send a RELOAD to a running tincd when a new invitation key has been generated.

7 years agoClean up leftover tincd and sptps_test processes.
Guus Sliepen [Sun, 1 Sep 2013 20:58:45 +0000 (22:58 +0200)]
Clean up leftover tincd and sptps_test processes.

7 years agoFix tincd logfile location when running tests.
Guus Sliepen [Sun, 1 Sep 2013 19:55:16 +0000 (21:55 +0200)]
Fix tincd logfile location when running tests.

7 years agoFix broken build with --with-openssl, --with-libgcrypt.
Etienne Dechamps [Sun, 1 Sep 2013 19:07:32 +0000 (20:07 +0100)]
Fix broken build with --with-openssl, --with-libgcrypt.

When --with-openssl is used, $openssl is set to the specified path.
Unfortunately, that confuses the OPENSSL conditional which expects it to
be set to "true". The result is that the contents of the openssl/
directory are not built when --with-openssl is used, resulting in
undefined references and a broken build.

In addition, there is a typo in the GCRYPT conditional definition
("grypt" instead of "gcrypt") which means GCRYPT never gets set,
(presumably) breaking builds using libgcrypt.

These regressions were introduced in

7 years agoAdd test for import, export and exchange commands.
Guus Sliepen [Sun, 1 Sep 2013 19:07:02 +0000 (21:07 +0200)]
Add test for import, export and exchange commands.

7 years agoSmall fixes for tests.
Guus Sliepen [Sun, 1 Sep 2013 19:06:25 +0000 (21:06 +0200)]
Small fixes for tests.

7 years agoMake sptps_test more easy to work with.
Guus Sliepen [Sun, 1 Sep 2013 14:02:49 +0000 (16:02 +0200)]
Make sptps_test more easy to work with.

It now defers reading from stdin until after the authentication phase is
completed.  Furthermore, it supports the -q, -r, -w options similar to those of
J├╝rgen Nickelsen's socket.

7 years agoSome shells set $_ to an absolute path.
Guus Sliepen [Sun, 1 Sep 2013 13:40:59 +0000 (15:40 +0200)]
Some shells set $_ to an absolute path.

7 years agoStart of a test suite.
Guus Sliepen [Sat, 31 Aug 2013 22:39:14 +0000 (00:39 +0200)]
Start of a test suite.

7 years agoAllow testing the replay window with sptps_test.
Guus Sliepen [Fri, 30 Aug 2013 12:23:02 +0000 (14:23 +0200)]
Allow testing the replay window with sptps_test.

7 years agoFix the replay window in SPTPS.
Guus Sliepen [Fri, 30 Aug 2013 12:22:05 +0000 (14:22 +0200)]
Fix the replay window in SPTPS.

7 years agoFix CTR mode.
Guus Sliepen [Fri, 30 Aug 2013 11:43:23 +0000 (13:43 +0200)]
Fix CTR mode.

7 years agoAdd an option to test datagram SPTPS with packet loss.
Guus Sliepen [Fri, 30 Aug 2013 11:04:14 +0000 (13:04 +0200)]
Add an option to test datagram SPTPS with packet loss.

7 years agoWhen generating invitations, handle any order of Port and Adress statements.
Guus Sliepen [Wed, 28 Aug 2013 12:24:07 +0000 (14:24 +0200)]
When generating invitations, handle any order of Port and Adress statements.

7 years agoCall WSAStartup() in main().
Guus Sliepen [Tue, 27 Aug 2013 19:19:50 +0000 (21:19 +0200)]
Call WSAStartup() in main().

The tinc utility defered calling WSAStartup() until it tried to connect to a
running tinc daemon. However, socket functions are now also used for other
things (like joining another VPN using an invitation). Now we just
unconditionally call WSAStartup() early in main().

7 years agoTell invited node about Mode and Broadcast settings.
Guus Sliepen [Fri, 23 Aug 2013 22:48:24 +0000 (00:48 +0200)]
Tell invited node about Mode and Broadcast settings.

Since these settings really should be the same for all nodes in a VPN.

7 years agoUse PATHEXT when checking for the presence of scripts on Windows.
Guus Sliepen [Fri, 23 Aug 2013 17:24:36 +0000 (19:24 +0200)]
Use PATHEXT when checking for the presence of scripts on Windows.

It seems like a lot of overhead to call access() for every possible extension
defined in PATHEXT, but apparently this is what Windows does itself too. At
least this avoids calling system() when the script one is looking for does not
exist at all.

Since the tinc utility also needs to call scripts, execute_script() is now
split off into its own source file.

7 years agoExecute scripts when invitations are created or accepted.
Guus Sliepen [Tue, 20 Aug 2013 22:24:55 +0000 (00:24 +0200)]
Execute scripts when invitations are created or accepted.

7 years agoEnsure the invitation filenames do not reveal the secret cookie.
Guus Sliepen [Tue, 20 Aug 2013 21:09:36 +0000 (23:09 +0200)]
Ensure the invitation filenames do not reveal the secret cookie.

Since filenames could potentially leak to unprivileged users (for example,
because of locatedb), it should not contain the cookie used for invitations.
Instead, tinc now uses the hash of the cookie and the invitation key as the
filename to store pending invitations in.

7 years agoLet a server explicitly send a notification when the invitation protocol succeeded.
Guus Sliepen [Tue, 20 Aug 2013 20:36:31 +0000 (22:36 +0200)]
Let a server explicitly send a notification when the invitation protocol succeeded.

7 years agoUse our own infrastructure for finding out the local node's externally visible host...
Guus Sliepen [Tue, 20 Aug 2013 14:49:03 +0000 (16:49 +0200)]
Use our own infrastructure for finding out the local node's externally visible host name.

7 years agoResolve the local host name before generating the invitation file.
Guus Sliepen [Tue, 20 Aug 2013 14:47:07 +0000 (16:47 +0200)]
Resolve the local host name before generating the invitation file.

7 years agoBind outgoing sockets again.
Guus Sliepen [Sun, 18 Aug 2013 21:55:40 +0000 (23:55 +0200)]
Bind outgoing sockets again.

Commit cff5a84 removed the feature of binding outgoing TCP sockets to a local
address. We now call bind() again, but only if there is exactly one listening
socket with the same address family as the destination address of the outgoing

7 years agoRemove broadcast of KEY_CHANGED message during tinc's initialization.
Guus Sliepen [Sun, 18 Aug 2013 20:43:55 +0000 (22:43 +0200)]
Remove broadcast of KEY_CHANGED message during tinc's initialization.

7 years agoFix order of tincd's initialization.
Guus Sliepen [Sun, 18 Aug 2013 20:35:27 +0000 (22:35 +0200)]
Fix order of tincd's initialization.

The order in which tinc initialized things was not completely correct. Now, it
is done as follows:

- Load and parse configuration files.
- Create all TCP and UDP listening sockets.
- Create PID file and UNIX socket.
- Run the tinc-up script.
- Drop privileges.
- Start outgoing connections.
- Run the main loop.

The PID file can only be created correctly if the listening sockets have been
set up ,as it includes the address and port of the first listening socket. The
tinc-up script has to be run after the PID file and UNIX socket have been
created so it can change their permissions if necessary. Outgoing connections
should only be started right before the main loop, because this is not really
part of the initialization.

7 years agoDon't force a .bat extension for scripts under Windows.
Guus Sliepen [Sun, 18 Aug 2013 16:20:41 +0000 (18:20 +0200)]
Don't force a .bat extension for scripts under Windows.

7 years agoCreate UNIX socket at the same time as the PID file is created.
Guus Sliepen [Sun, 18 Aug 2013 15:02:49 +0000 (17:02 +0200)]
Create UNIX socket at the same time as the PID file is created.

The PID file was created before tinc-up was called, but the UNIX socket was
created afterwards, which meant one could not change the UNIX socket's owner or
permissions from the tinc-up script.

7 years agoRemove texi2html rule in docs/Makefile.
Guus Sliepen [Wed, 14 Aug 2013 14:20:32 +0000 (16:20 +0200)]
Remove texi2html rule in docs/Makefile.

According to Debian, texi2html is deprecated and makeinfo --html should be used
instead. Automake already provides a html target that invokes makeinfo.

7 years agoStop using EXTRA_DIST in src/Makefile.am.
Guus Sliepen [Wed, 14 Aug 2013 14:17:12 +0000 (16:17 +0200)]
Stop using EXTRA_DIST in src/Makefile.am.

Automake finds the files in the subdirectories of src/ now that they are
properly declared in the _SOURCES variables. Using EXTRA_DIST would now cause
.o files to be included in the tarball.

7 years agoReleasing 1.1pre8. release-1.1pre8
Guus Sliepen [Tue, 13 Aug 2013 20:05:43 +0000 (22:05 +0200)]
Releasing 1.1pre8.

7 years agoDon't typedef the same struct in two header files.
Guus Sliepen [Tue, 13 Aug 2013 18:40:40 +0000 (20:40 +0200)]
Don't typedef the same struct in two header files.

Some (older?) versions of GCC don't like this.

7 years agoUpdate copyright notices.
Guus Sliepen [Tue, 13 Aug 2013 18:38:57 +0000 (20:38 +0200)]
Update copyright notices.

7 years agoBuild .tar.gz instead of .tar.xz.
Guus Sliepen [Tue, 13 Aug 2013 18:37:55 +0000 (20:37 +0200)]
Build .tar.gz instead of .tar.xz.

Only FreeBSD's tar supports xz compression, the other BSDs do not. NetBSD doesn't even
like bzip2.

7 years agoMove .h files from noinst_HEADERS to tincd_SOURCES.
Guus Sliepen [Tue, 13 Aug 2013 18:35:48 +0000 (20:35 +0200)]
Move .h files from noinst_HEADERS to tincd_SOURCES.

This is the recommended way according to the Automake manual.

7 years agoDon't echo broadcast packets back when Broadcast = direct.
Guus Sliepen [Thu, 8 Aug 2013 15:40:15 +0000 (17:40 +0200)]
Don't echo broadcast packets back when Broadcast = direct.

7 years agoFix a typo.
Guus Sliepen [Fri, 2 Aug 2013 21:51:55 +0000 (23:51 +0200)]
Fix a typo.

7 years agoNon-zero exit code when reloading config file fails after SIGHUP.
Guus Sliepen [Fri, 2 Aug 2013 21:46:19 +0000 (23:46 +0200)]
Non-zero exit code when reloading config file fails after SIGHUP.

When reloading the configuration file via the tinc command, the user will get
an error message if reloading has failed. However, no such warning exists when
sending a HUP signal. Previously, tincd would exit in both cases, but with a
zero exit code. Now it will exit with code 1 when reloading fails after a
SIGHUP, but tincd will keep running if it is signaled via the tinc command.
Instead, the tinc command will exit with a non-zero exit code.

7 years agoReally retry outgoing connections immediately if requested.
Guus Sliepen [Fri, 2 Aug 2013 18:53:54 +0000 (20:53 +0200)]
Really retry outgoing connections immediately if requested.

The retry() function would only abort connections that were in progress of
being made, it wouldn't reschedule the outgoing connections that had been

7 years agoClean up the SIGINT handler.
Guus Sliepen [Fri, 2 Aug 2013 18:50:19 +0000 (20:50 +0200)]
Clean up the SIGINT handler.

7 years agoUse umask() to set file and UNIX socket permissions without race conditions.
Guus Sliepen [Fri, 2 Aug 2013 17:27:06 +0000 (19:27 +0200)]
Use umask() to set file and UNIX socket permissions without race conditions.

As mentioned by Erik Tews, calling fchmod() after fopen() leaves a small window
for exploits. As long as tinc is single-threaded, we can use umask() instead to
reduce file permissions. This also works when creating the AF_UNIX control socket.

The umask of the user running tinc(d) is used for most files, except for the
private keys, invitation files, PID file and control socket.

7 years agoDefer handling netname conflicts when accepting an invitation.
Guus Sliepen [Fri, 26 Jul 2013 13:48:52 +0000 (15:48 +0200)]
Defer handling netname conflicts when accepting an invitation.

In case no explicit netname of configuration directory is specified when
accepting an invitation, the netname specified in the invitation data is
used. However, this new netname is only known after making the connection
to the server. If the new netname conflicts with an existing one at the
client, we ask the user for a netname that doesn't conflict. However, we
should first finish accepting the invitation, so we don't run into the
problem that the server times out and cancels the invitation. So, we create
a random netname and store the files there, and only after we finish
accepting the invitation we ask the user for a better netname, and then
just rename the temporary directory to the final name.

7 years agoMake absolutely sure we can write config files before accepting an invitation.
Guus Sliepen [Fri, 26 Jul 2013 13:44:05 +0000 (15:44 +0200)]
Make absolutely sure we can write config files before accepting an invitation.

7 years agoChoose a different Port when 655 isn't available when doing "tinc join".
Guus Sliepen [Fri, 26 Jul 2013 12:53:36 +0000 (14:53 +0200)]
Choose a different Port when 655 isn't available when doing "tinc join".

7 years agoChoose a different Port when 655 isn't available when doing "tinc init".
Guus Sliepen [Fri, 26 Jul 2013 12:17:15 +0000 (14:17 +0200)]
Choose a different Port when 655 isn't available when doing "tinc init".

If port 655 cannot be bound to when using the init command, tinc will try to
find a random port number that can be bound to, and will add the appropriate
Port variable to its host config file. A warning will be printed as well.

7 years agoDon't forget the Port variable when creating an invitation URL.
Guus Sliepen [Thu, 25 Jul 2013 15:17:33 +0000 (17:17 +0200)]
Don't forget the Port variable when creating an invitation URL.

7 years agoAllow control-C to stop tincd without stopping the tinc shell.
Guus Sliepen [Thu, 25 Jul 2013 15:14:07 +0000 (17:14 +0200)]
Allow control-C to stop tincd without stopping the tinc shell.

7 years agoWarn when incorrect use of add or set causes variables to be removed.
Guus Sliepen [Thu, 25 Jul 2013 14:21:11 +0000 (16:21 +0200)]
Warn when incorrect use of add or set causes variables to be removed.

7 years agoFix compression when using the SPTPS protocol.
Guus Sliepen [Wed, 24 Jul 2013 18:48:31 +0000 (20:48 +0200)]
Fix compression when using the SPTPS protocol.

7 years agoHonour umask, let temporary key files inherit original's permissions.
Guus Sliepen [Mon, 22 Jul 2013 20:58:13 +0000 (22:58 +0200)]
Honour umask, let temporary key files inherit original's permissions.

During the init command, tinc changed the umask to 077 when writing the public
and private key files, to prevent the temporary copies from being world
readable. However, subsequently created files would therefore also be
unreadable for others. Now we don't change the umask anymore, therefore
allowing the user to choose whether the files are world readable or not by
setting the umask as desired. The private key files are still made unreadable
for others of course. Temporary files now inherit the permissions of the
original, and the tinc-up script's permissions now also honour the umask.

7 years agoFurther improve bandwidth estimation for type 2 MTU probe replies.
Etienne Dechamps [Mon, 22 Jul 2013 20:22:26 +0000 (21:22 +0100)]
Further improve bandwidth estimation for type 2 MTU probe replies.

This patch adds timestamp information to type 2 MTU probe replies. This
timestamp can then be used by the recipient to estimate bandwidth more
accurately, as jitter in the RX direction won't affect the results.

7 years agoIntroduce lightweight PMTU probe replies.
Etienne Dechamps [Sun, 21 Jul 2013 12:05:42 +0000 (13:05 +0100)]
Introduce lightweight PMTU probe replies.

When replying to a PMTU probe, tinc sends a packet with the same length
as the PMTU probe itself, which is usually large (~1450 bytes). This is
not necessary: the other node wants to know the size of the PMTU probes
that have been received, but encoding this information as the actual
reply length is probably the most inefficient way to do it. It doubles
the bandwidth usage of the PMTU discovery process, and makes it less
reliable since large packets are more likely to be dropped.

This patch introduces a new PMTU probe reply type, encoded as type "2"
in the first byte of the packet, that indicates that the length of the
PMTU probe that is being replied to is encoded in the next two bytes of
the packet. Thus reply packets are only 3 bytes long.

(This also protects against very broken networks that drop very small
packets - yes, I've seen it happen on a subnet of a national ISP - in
such a case the PMTU probe replies will be dropped, and tinc won't
enable UDP communication, which is a good thing.)

Because legacy nodes won't understand type 2 probe replies, the minor
protocol number is bumped to 3.

Note that this also improves bandwidth estimation, as it is able to
measure bandwidth in both directions independently (the node receiving
the replies is measuring in the TX direction) and the use of smaller
reply packets might decrease the influence of jitter.

7 years agoDisable PMTU discovery when TCPOnly is set.
Etienne Dechamps [Sat, 20 Jul 2013 21:59:57 +0000 (22:59 +0100)]
Disable PMTU discovery when TCPOnly is set.

Obviously, PMTU discovery doesn't make much sense when we know we'll be
using TCP anyway.

7 years agoAllow extra options to be passed to "tinc restart" again.
Guus Sliepen [Sat, 20 Jul 2013 22:20:54 +0000 (00:20 +0200)]
Allow extra options to be passed to "tinc restart" again.

7 years agoForbid protocol version rollback.
Guus Sliepen [Sat, 20 Jul 2013 22:13:38 +0000 (00:13 +0200)]
Forbid protocol version rollback.

When we know a node's ECDSA key, we only allow communication via the SPTPS

7 years agoAttribution for Etienne Dechamps.
Guus Sliepen [Sat, 20 Jul 2013 21:41:01 +0000 (23:41 +0200)]
Attribution for Etienne Dechamps.

7 years agoFix hash_function().
Etienne Dechamps [Sat, 20 Jul 2013 13:50:28 +0000 (14:50 +0100)]
Fix hash_function().

The hashing function that tinc uses is currently broken as it only looks
at the first 4 bytes of data.

This leads to interesting bugs, like the node UDP address cache being
subtly broken because two addresses with the same protocol and port (but
not the same IP address) will override each other. This is because
the first four bytes of sockaddr_in contains the IP protocol and port,
while the IP address itself is contained in the four remaining bytes
that are never used when the hash is computed.

7 years agoDon't use vasprintf() anymore on Windows.
Guus Sliepen [Wed, 17 Jul 2013 16:06:56 +0000 (18:06 +0200)]
Don't use vasprintf() anymore on Windows.

Windows doesn't actually support it, but MinGW provides it. However, with some versions of
MinGW it doesn't work correctly. Instead, we vsnprintf() to a local buffer and xstrdup() the

7 years agoDon't search in local directories for include files.
Guus Sliepen [Wed, 17 Jul 2013 16:02:07 +0000 (18:02 +0200)]
Don't search in local directories for include files.

Tinc's source code doesn't rely on this anymore, and this gets rid of potential conflicts with
system headers.

7 years agoAdd missing definitions on Windows.
Guus Sliepen [Wed, 17 Jul 2013 16:00:40 +0000 (18:00 +0200)]
Add missing definitions on Windows.

7 years agoFix warning "Both netname and configuration directory given" on Windows.
Guus Sliepen [Mon, 15 Jul 2013 12:48:43 +0000 (14:48 +0200)]
Fix warning "Both netname and configuration directory given" on Windows.

7 years agoFix combination of Mode = router and DeviceType = tap on Linux.
Etienne Dechamps [Sat, 13 Jul 2013 22:34:42 +0000 (23:34 +0100)]
Fix combination of Mode = router and DeviceType = tap on Linux.

I believe I have found a bug in tinc on Linux when it is used with
Mode = router and DeviceType = tap. This combination is useful because
it allows global broadcast packets to be used in router mode. However,
when tinc receives a packet in this situation, it needs to make sure its
destination MAC address matches the address of the TAP adapter, which is
typically not the case since the sending node doesn't know the MAC
address of the recipient. Unfortunately, this is not the case on Linux,
which breaks connectivity.

7 years agoAdd connection rate limiting.
Guus Sliepen [Thu, 11 Jul 2013 21:38:38 +0000 (23:38 +0200)]
Add connection rate limiting.

Tinc now strictly limits incoming connections from the same host to 1 per
second. For incoming connections from multiple hosts short bursts of incoming
connections are allowed (by default 100), but on average also only 1 connection
per second is allowed.

When an incoming connection exceeds the limit, tinc will keep the connection in
a tarpit; the connection will be kept open but it is ignored completely. Only
one connection is in a tarpit at a time to limit the number of useless open

7 years agoSet $NAME when calling host-up/down and subnet-up/down scripts.
Guus Sliepen [Fri, 5 Jul 2013 19:36:51 +0000 (21:36 +0200)]
Set $NAME when calling host-up/down and subnet-up/down scripts.

7 years agoAdd the LocalDiscoveryAddress option.
Guus Sliepen [Fri, 31 May 2013 16:50:34 +0000 (18:50 +0200)]
Add the LocalDiscoveryAddress option.

When LocalDiscovery is enabled, tinc normally sends broadcast packets during
PMTU discovery to the broadcast address ( or ff02::1). This
option lets tinc use a different address.

At the moment only one LocalDiscoveryAddress can be specified.

7 years agoUse strerror() instead of gai_strerror() when err == EAI_SYSTEM.
Guus Sliepen [Fri, 31 May 2013 15:23:00 +0000 (17:23 +0200)]
Use strerror() instead of gai_strerror() when err == EAI_SYSTEM.

7 years agoAllow the log output to be stopped with control-C in tinc's shell.
Guus Sliepen [Thu, 30 May 2013 15:38:48 +0000 (17:38 +0200)]
Allow the log output to be stopped with control-C in tinc's shell.

7 years agoBetter optional argument handling.
Guus Sliepen [Thu, 30 May 2013 14:53:16 +0000 (16:53 +0200)]
Better optional argument handling.

Some options can take an optional argument. However, in this case GNU getopt
requires that the optional argument is right next to the option without
whitespace inbetween. If there is whitespace, getopt will treat it as a
non-option argument, but tincd ignored those without a warning. Now tincd will
allow optional arguments with whitespace inbetween, and will give an error when
it encounters any other non-option arguments.

The tinc binary now requires that all options for itself are given before the

7 years agoAdd an invitation protocol.
Guus Sliepen [Wed, 29 May 2013 16:31:10 +0000 (18:31 +0200)]
Add an invitation protocol.

Using the tinc command, an administrator of an existing VPN can generate
invitations for new nodes. The invitation is a small URL that can easily
be copy&pasted into email or live chat. Another person can have tinc
automatically setup the necessary configuration files and exchange keys
with the server, by only using the invitation URL.

The invitation protocol uses temporary ECDSA keys. The invitation URL
consists of the hostname and port of the server, a hash of the server's
temporary ECDSA key and a cookie. When the client wants to accept an
invitation, it also creates a temporary ECDSA key, connects to the server
and says it wants to accept an invitation. Both sides exchange their
temporary keys. The client verifies that the server's key matches the hash
in the invitation URL. After setting up an SPTPS connection using the
temporary keys, the client gives the cookie to the server. If the cookie
is valid, the server sends the client an invitation file containing the
client's new name and a copy of the server's host config file. If everything
is ok, the client will generate a long-term ECDSA key and send it to the
server, which will add it to a new host config file for the client.

The invitation protocol currently allows multiple host config files to be
send from the server to the client. However, the client filters out
most configuration variables for its own host configuration file. In
particular, it only accepts Name, Mode, Broadcast, ConnectTo, Subnet and
AutoConnect. Also, at the moment no tinc-up script is generated.

When an invitation has succesfully been accepted, the client needs to start
the tinc daemon manually.

7 years agoFix port number in pidfile.
Guus Sliepen [Tue, 28 May 2013 11:41:53 +0000 (13:41 +0200)]
Fix port number in pidfile.

7 years agoAdd a newline when logging to stderr in the tinc binary.
Guus Sliepen [Tue, 28 May 2013 11:40:32 +0000 (13:40 +0200)]
Add a newline when logging to stderr in the tinc binary.

7 years agoImprove base64 encoding/decoding, add URL-safe variant.
Guus Sliepen [Tue, 28 May 2013 11:39:15 +0000 (13:39 +0200)]
Improve base64 encoding/decoding, add URL-safe variant.

b64decode() now returns length 0 when an invalid character was encountered.

7 years agoAnnotate the xalloc functions.
Guus Sliepen [Tue, 28 May 2013 11:36:26 +0000 (13:36 +0200)]
Annotate the xalloc functions.

Most important is the annotation of xasprintf() with the format attribute,
which allows the compiler to give warnings about the format string and

7 years agoSend a new key when we receive packets from a node we don't have a valid key for.
Guus Sliepen [Sat, 18 May 2013 14:11:30 +0000 (16:11 +0200)]
Send a new key when we receive packets from a node we don't have a valid key for.

7 years agoEnable and fix warnings from automake.
Guus Sliepen [Wed, 15 May 2013 11:55:06 +0000 (13:55 +0200)]
Enable and fix warnings from automake.

7 years agoModified some error messages in src/sptps.c.
Sven-Haegar Koch [Tue, 14 May 2013 00:57:35 +0000 (02:57 +0200)]
Modified some error messages in src/sptps.c.

7 years agoDon't try to handle incoming data if sptps_start() has not been called yet.
Guus Sliepen [Sun, 12 May 2013 11:39:22 +0000 (13:39 +0200)]
Don't try to handle incoming data if sptps_start() has not been called yet.

7 years agoFix potential NULL pointer dereferences.
Guus Sliepen [Sat, 11 May 2013 14:54:50 +0000 (16:54 +0200)]
Fix potential NULL pointer dereferences.

7 years agoDon't free ephemeral ECDH keys twice.
Guus Sliepen [Sat, 11 May 2013 12:13:23 +0000 (14:13 +0200)]
Don't free ephemeral ECDH keys twice.

ecdh_compute_shared() was changed to immediately delete the ephemeral key after
the shared secret was computed.  Therefore, the pointer to the ecdh_t struct
should be zeroed so it won't be freed again when a struct sptps_t is freed.

7 years agoUse read_host_config() where appropriate.
Guus Sliepen [Sat, 11 May 2013 12:05:28 +0000 (14:05 +0200)]
Use read_host_config() where appropriate.

7 years agoFix check for presence of ECDSA public key for outgoing connections.
Guus Sliepen [Sat, 11 May 2013 12:04:39 +0000 (14:04 +0200)]
Fix check for presence of ECDSA public key for outgoing connections.

At this point, c->config_tree may or may not be NULL, but this does not tell us whether it is an
outgoing connection or not. For incoming connections, we do not know the peer's name yet,
so we always have to claim ECDSA support. For outgoing connections, we always need to check
whether we have the peer's ECDSA public key, so that if we don't, we correctly tell the peer that
we want to upgrade.

7 years agoEnable the SPTPS protocol by default.
Guus Sliepen [Fri, 10 May 2013 19:11:45 +0000 (21:11 +0200)]
Enable the SPTPS protocol by default.