Guus Sliepen [Sat, 17 Apr 2010 10:21:53 +0000 (12:21 +0200)]
Merge branch 'master' into 1.1
Conflicts:
NEWS
README
configure.in
src/net.c
src/net.h
Guus Sliepen [Sat, 17 Apr 2010 10:03:08 +0000 (12:03 +0200)]
Fix experimental GUI when reading hexadecimal values.
Guus Sliepen [Sat, 17 Apr 2010 10:01:38 +0000 (12:01 +0200)]
Fix reading configuration files that do not end with a newline. Again.
Guus Sliepen [Sun, 11 Apr 2010 18:40:20 +0000 (20:40 +0200)]
Releasing 1.0.13.
Guus Sliepen [Sun, 11 Apr 2010 17:47:44 +0000 (19:47 +0200)]
Mark Forwarding and DirectOnly options as being experimental.
Guus Sliepen [Sun, 11 Apr 2010 17:39:31 +0000 (19:39 +0200)]
Don't redefine MAX if it already exists.
Guus Sliepen [Sun, 11 Apr 2010 17:20:02 +0000 (19:20 +0200)]
Fixes for definitions under Windows.
Guus Sliepen [Sun, 11 Apr 2010 16:34:50 +0000 (18:34 +0200)]
Ensure subnet-up/down scripts are called after HUP when necessary.
Guus Sliepen [Sun, 11 Apr 2010 02:35:16 +0000 (04:35 +0200)]
Fix reloading Subnets when StrictSubnets is set.
Guus Sliepen [Sat, 10 Apr 2010 22:50:42 +0000 (00:50 +0200)]
Reload Subnets when getting a HUP signal and StrictSubnets is used.
Guus Sliepen [Sat, 10 Apr 2010 21:55:15 +0000 (23:55 +0200)]
Ensure ICMP_NET_ANO is defined.
Guus Sliepen [Sat, 3 Apr 2010 08:46:45 +0000 (09:46 +0100)]
Convert Port to numeric form before sending it to other nodes.
If one uses a symbolic name for the Port option, tinc will send that name
literally to other nodes. However, it is not guaranteed that all nodes have
the same contents in /etc/services, or have such a file at all.
Sven-Haegar Koch [Wed, 31 Mar 2010 01:56:53 +0000 (03:56 +0200)]
Fixed metadata protokoll corruption on forwarded requests
When forwarding a metadata request through forward_request() we were
adding the required newline char to our buffer, but then sending the
data without it - this results in the forwarded request and the next one
to be garbled together.
Additionally while at it add a warning comment that request string is
not zero terminated anymore after a call to the forward_request()
function - for now this is ok as it is not used by any caller after this.
Sven-Haegar Koch [Fri, 26 Mar 2010 16:25:18 +0000 (17:25 +0100)]
Demote all LOG_EMERG to LOG_ERR, spamming all xterms is bad.
Sven-Haegar Koch [Fri, 26 Mar 2010 15:54:13 +0000 (16:54 +0100)]
README.git: tinc 1.1 needs libevent
Sven-Haegar Koch [Sun, 28 Mar 2010 15:51:26 +0000 (17:51 +0200)]
Function flush_meta() does not exist anymore.
Sven-Haegar Koch [Fri, 26 Mar 2010 16:07:30 +0000 (17:07 +0100)]
Add missing AC_CHECK_HEADERS([dirent.h]) to configure.in
Sven-Haegar Koch [Fri, 26 Mar 2010 16:18:04 +0000 (17:18 +0100)]
Fixed 1.0 miss-merges
Sven-Haegar Koch [Fri, 26 Mar 2010 15:51:03 +0000 (16:51 +0100)]
Merge branch 'master' into 1.1
Conflicts:
NEWS
README
configure.in
have.h
src/conf.c
src/conf.h
src/net.c
src/net_packet.c
src/protocol_key.c
src/protocol_subnet.c
src/route.c
src/tincd.c
Sven-Haegar Koch [Wed, 10 Mar 2010 01:50:51 +0000 (02:50 +0100)]
Never delete Subnets when StrictSubnets is set
If a node is unreachable, and not connected to an edge anymore, it gets
deleted. When this happens its subnets are also removed, which should
not happen with StrictSubnets=yes.
Solution:
- do not remove subnets in src/net.c::purge(), we know that all subnets
in the list came from our hosts files.
I think here you got the check wrong by looking at the tunnelserver
code below it - with strictsubnets we still inform others but do not
remove the subnet from our data.
- do not remove nodes in net.c::purge() that still have subnets
attached.
Guus Sliepen [Wed, 10 Mar 2010 15:07:01 +0000 (16:07 +0100)]
Fix typo.
Guus Sliepen [Mon, 8 Mar 2010 20:44:32 +0000 (21:44 +0100)]
Log unauthorized Subnets when StrictSubnets is set.
Guus Sliepen [Mon, 8 Mar 2010 16:54:57 +0000 (17:54 +0100)]
ConnectTo does not mean tinc does not listen for incoming connections anymore.
Guus Sliepen [Tue, 2 Mar 2010 22:27:50 +0000 (23:27 +0100)]
Fixes for the Forwarding option.
Guus Sliepen [Tue, 2 Mar 2010 21:55:24 +0000 (22:55 +0100)]
Add the DirectOnly option.
When this option is enabled, packets that cannot be sent directly to the destination node,
but which would have to be forwarded by an intermediate node, are dropped instead.
When combined with the IndirectData option,
packets for nodes for which we do not have a meta connection with are also dropped.
Guus Sliepen [Tue, 2 Mar 2010 21:34:26 +0000 (22:34 +0100)]
Add the Forwarding option.
This determines if and how incoming packets that are not meant for the local
node are forwarded. It can either be off, internal (tinc forwards them itself,
as in previous versions), or kernel (packets are always sent to the TUN/TAP
device, letting the kernel sort them out).
Guus Sliepen [Mon, 1 Mar 2010 23:18:44 +0000 (00:18 +0100)]
Add the StrictSubnets option.
When this option is enabled, tinc will not accept dynamic updates of Subnets
from other nodes, but will only use Subnets read from local host config files
to build its routing table.
Guus Sliepen [Mon, 1 Mar 2010 22:44:56 +0000 (23:44 +0100)]
Preload all Subnets in TunnelServer mode.
This simplifies the logic in protocol_subnet.c.
Guus Sliepen [Mon, 1 Mar 2010 22:44:46 +0000 (23:44 +0100)]
Check for dirent.h.
Guus Sliepen [Mon, 1 Mar 2010 22:35:02 +0000 (23:35 +0100)]
Simplify reading lines from configuration files.
Instead of allocating storage for each line read, we now read into fixed-size
buffers on the stack. This fixes a case where a malformed configuration file
could crash tinc.
Guus Sliepen [Sun, 28 Feb 2010 17:20:13 +0000 (18:20 +0100)]
Clamp MSS to miminum MTU in both directions.
Clamp MSS of both incoming and outgoing packets, and use the minimum of the
PMTU of both directions when clamping.
Timothy Redaelli [Wed, 10 Feb 2010 13:52:15 +0000 (14:52 +0100)]
Add --disable-zlib configure option
Timothy Redaelli [Wed, 10 Feb 2010 12:24:33 +0000 (13:24 +0100)]
Add --disable-lzo configure option
Guus Sliepen [Wed, 3 Feb 2010 21:49:48 +0000 (22:49 +0100)]
Releasing 1.0.12.
Guus Sliepen [Wed, 3 Feb 2010 10:18:46 +0000 (11:18 +0100)]
Ensure peers with a meta connection always have our key.
This keeps UDP probes going, which in turn keeps NAT mappings alive.
Guus Sliepen [Tue, 2 Feb 2010 21:49:21 +0000 (22:49 +0100)]
Update copyright notices.
Guus Sliepen [Tue, 2 Feb 2010 21:22:27 +0000 (22:22 +0100)]
Try to set DF bit on BSDs as well.
Every operating system seems to have its own, slightly different way to disable
packet fragmentation. Emit a compiler warning when no suitable way is found.
On OpenBSD, it seems impossible to do it for IPv4.
Guus Sliepen [Tue, 2 Feb 2010 00:02:40 +0000 (01:02 +0100)]
Immediately exchange keys when establishing a meta connection.
This in turn will trigger PMTU discovery, and ensures nodes know each others
reflexive UDP address and port.
Guus Sliepen [Mon, 1 Feb 2010 23:51:44 +0000 (00:51 +0100)]
Determine peer's reflexive address and port when exchanging keys.
To help peers that are behind NAT connect to each other directly via UDP, they
need to know the exact external address and port that they use. Keys exchanged
between NATted peers necessarily go via a third node, which knows this address
and port, and can append this information to the keys, which is in turned used
by the peers.
Since PMTU discovery will immediately trigger UDP communication from both sides
to each other, this should allow direct communication between peers behind
full, address-restricted and port-restricted cone NAT.
Guus Sliepen [Sat, 23 Jan 2010 17:48:01 +0000 (18:48 +0100)]
Be liberal in accepting KEY_CHANGED/REQ_KEY/ANS_KEY requests.
When we got a key request for or from a node we don't know, we disconnected the
node that forwarded us that request. However, especially in TunnelServer mode,
disconnecting does not help. We now ignore such requests, but since there is no
way of telling the original sender that the request was dropped, we now retry
sending REQ_KEY requests when we don't get an ANS_KEY back.
Guus Sliepen [Fri, 22 Jan 2010 20:59:40 +0000 (21:59 +0100)]
Run subnet-up/down scripts for local MAC addresses as well.
Guus Sliepen [Fri, 22 Jan 2010 20:47:26 +0000 (21:47 +0100)]
Fix subnet-up/down scripts being called with an empty SUBNET.
Commit
052ff8b2c598358d1c5febaa9f9f5fc5d384cfd3 contained a bug that causes
scripts to be called with an empty, or possibly corrupted SUBNET variable when
a Subnet is added or removed while the owner is still online. In router mode,
this normally does not happen, but in switch mode this is normal.
Guus Sliepen [Sat, 16 Jan 2010 19:16:33 +0000 (20:16 +0100)]
Make MSS clamping configurable, but enabled by default.
It can either be set globally in tinc.conf, or per-node in host config files.
Guus Sliepen [Sat, 16 Jan 2010 18:32:33 +0000 (19:32 +0100)]
Also clamp MSS of TCP over IPv6 packets.
Guus Sliepen [Fri, 15 Jan 2010 22:41:14 +0000 (23:41 +0100)]
Optimise handling of select() returning <= 0.
Before, we immediately retried select() if it returned -1 and errno is EAGAIN
or EINTR, and if it returned 0 it would check for network events even if we
know there are none. Now, if -1 or 0 is returned we skip checking network
events, but we do check for timer and signal events.
Guus Sliepen [Fri, 15 Jan 2010 22:19:08 +0000 (23:19 +0100)]
Ping nodes immediately when receiving SIGALRM.
One reason to send the ALRM signal is to let tinc immediately try to connect to
outgoing nodes, for example when PPP or DHCP configuration of the outgoing
interface finished. Conversely, when the outgoing interface goes down one can
now send this signal to let tinc quickly detect that links are down too.
Guus Sliepen [Fri, 15 Jan 2010 12:42:37 +0000 (13:42 +0100)]
Clamp MSS of IPv4 SYN packets.
Some ISPs block the ICMP Fragmentation Needed packets that tinc sends. We
clamp the MSS of IPv4 SYN packets to prevent hosts behind those ISPs from
sending too large packets.
Guus Sliepen [Thu, 31 Dec 2009 12:19:13 +0000 (13:19 +0100)]
Move source from lib/ to src/.
The utility functions in the lib/ directory do not really form a library.
Also, now that we build two binaries, tincctl does not need everything that was
in libvpn.a, so it is wasteful to link to it.
Guus Sliepen [Thu, 31 Dec 2009 12:09:14 +0000 (13:09 +0100)]
Remove unused AVL tree library.
Guus Sliepen [Thu, 24 Dec 2009 11:42:21 +0000 (12:42 +0100)]
Allow Port and PMTUDiscovery options in tinc.conf, always enable PMTUDiscovery by default.
Guus Sliepen [Wed, 23 Dec 2009 18:51:55 +0000 (19:51 +0100)]
Use xstrdup() instead of xasprintf() to copy static strings.
Guus Sliepen [Wed, 23 Dec 2009 18:49:38 +0000 (19:49 +0100)]
Allow port to be specified in Address statements.
This allows one to connect to use more than one port number to connect to
another node. The syntax is now:
Address = <hostname> [<port>]
Guus Sliepen [Wed, 23 Dec 2009 18:22:06 +0000 (19:22 +0100)]
Do not fragment packets smaller than RFC defined minimum MTUs.
For IPv6, the minimum MTU is 1280 (RFC 2460), for IPv4 the minimum is actually
68, but this is such a low limit that it will probably hurt performance, so we
do as if it is 576 (the minimum packet size hosts should be able to handle, RFC
791). If we detect a path MTU smaller than those minima, and we have to handle
a packet that is bigger than the PMTU but smaller than those minima, we forward
them via TCP instead of fragmenting or returning ICMP packets.
Guus Sliepen [Sat, 19 Dec 2009 22:23:25 +0000 (23:23 +0100)]
Do not use hardcoded cipher block length when padding.
Guus Sliepen [Sat, 19 Dec 2009 21:17:39 +0000 (22:17 +0100)]
Fix alignment of results of RSA operations when using libgcrypt.
If the result of an RSA encryption or decryption operation can be represented
in less bytes than given, gcry_mpi_print() will not add leading zero bytes. Fix
this by adding those ourself.
Guus Sliepen [Sat, 19 Dec 2009 19:53:48 +0000 (20:53 +0100)]
Do not consider unreachable nodes when trying to determine packet origin.
Guus Sliepen [Sat, 19 Dec 2009 19:52:19 +0000 (20:52 +0100)]
recv() and recvfrom() return int, do not prematurely cast the return value.
Guus Sliepen [Sat, 19 Dec 2009 19:26:30 +0000 (20:26 +0100)]
Fix reading raw RSA keys with libgcrypt.
Guus Sliepen [Sat, 19 Dec 2009 19:10:38 +0000 (20:10 +0100)]
Reinitialise block cipher IV each time we encrypt a packet when using libgcrypt.
Guus Sliepen [Sat, 19 Dec 2009 17:57:54 +0000 (18:57 +0100)]
Fix block cipher padding when using libgcrypt.
Guus Sliepen [Fri, 18 Dec 2009 00:15:25 +0000 (01:15 +0100)]
Fix packet authentication.
This wasn't working at all, since we didn't do HMAC but just a plain hash.
Also, verification of packets failed because it was checking the whole packet,
not the packet minus the HMAC.
Guus Sliepen [Wed, 16 Dec 2009 20:18:21 +0000 (21:18 +0100)]
Start of a GUI for tinc.
Guus Sliepen [Wed, 16 Dec 2009 20:16:56 +0000 (21:16 +0100)]
Allow connections to be closed.
This only closes existing meta connections, it may not affect node
reachability.
Guus Sliepen [Mon, 14 Dec 2009 20:25:06 +0000 (21:25 +0100)]
Include missing header files and source directories.
Guus Sliepen [Mon, 14 Dec 2009 20:20:56 +0000 (21:20 +0100)]
Do not include OpenSSL headers directly.
Guus Sliepen [Fri, 11 Dec 2009 21:38:06 +0000 (22:38 +0100)]
Fix compiler warnings.
Guus Sliepen [Fri, 11 Dec 2009 21:31:27 +0000 (22:31 +0100)]
Merge branch 'master' into 1.1
Conflicts:
src/subnet.c
Guus Sliepen [Fri, 11 Dec 2009 21:24:07 +0000 (22:24 +0100)]
Only call ioctlsocket() on Windows.
Guus Sliepen [Tue, 8 Dec 2009 22:18:37 +0000 (22:18 +0000)]
Forget addresses of unreachable nodes.
We clear the cached address used for UDP connections when a node becomes
unreachable. This also prevents host-up scripts from passing the old, cached
address from when the host becomes reachable again from a different address.
Guus Sliepen [Sat, 28 Nov 2009 11:56:13 +0000 (11:56 +0000)]
Remove unused variable in lookup_subnet_*() functions.
Guus Sliepen [Sat, 28 Nov 2009 11:52:23 +0000 (11:52 +0000)]
When learning MAC addresses, only check our own Subnets for previous entries.
Before it would check all addresses, and not learn an address if another node
already claimed that address. This caused fast roaming to fail, the code from
commit
6f6f426b353596edca77829c0477268fc2fc1925 was never triggered.
Guus Sliepen [Sat, 7 Nov 2009 22:43:25 +0000 (23:43 +0100)]
Use the TCP socket infrastructure for control sockets.
The control socket code was completely different from how meta connections are
handled, resulting in lots of extra code to handle requests. Also, not every
operating system has UNIX sockets, so we have to resort to another type of
sockets or pipes for those anyway. To reduce code duplication and make control
sockets work the same on all platforms, we now just connect to the TCP port
where tincd is already listening on.
To authenticate, the program that wants to control a running tinc daemon must
send the contents of a cookie file. The cookie is a random 256 bits number that
is regenerated every time tincd starts. The cookie file should only be readable
by the same user that can start a tincd.
Instead of the binary-ish protocol previously used, we now use an ASCII
protocol similar to that of the meta connections, but this can still change.
Guus Sliepen [Sat, 7 Nov 2009 15:09:56 +0000 (16:09 +0100)]
Small fixes to get really working control sockets on Windows.
Guus Sliepen [Sat, 7 Nov 2009 13:35:48 +0000 (14:35 +0100)]
Better integration of libevent in build system.
Since event.h is not part of tinc, we include it in have.h were all other
system header files are included. We also ensure -levent comes before -lgdi32
when compiling with MinGW, apparently it doesn't work when the order is
reversed.
Guus Sliepen [Thu, 5 Nov 2009 22:29:28 +0000 (23:29 +0100)]
Make sure the 1.1 branch compiles in a MinGW environment.
UNIX domain sockets, of course, don't exist on Windows. For now, when compiling
tinc in a MinGW environment, try to use a TCP socket bound to localhost as an
alternative.
Guus Sliepen [Wed, 4 Nov 2009 23:02:42 +0000 (00:02 +0100)]
Handle PKCS#5 padding in the gcrypt backend.
Guus Sliepen [Wed, 4 Nov 2009 23:01:25 +0000 (00:01 +0100)]
Handle truncated message authentication codes with gcrypt.
Commit
4124b9682f8f890acb25d0c92f2583eef670274a did not update the gcrypt
backend.
Guus Sliepen [Wed, 4 Nov 2009 15:19:08 +0000 (16:19 +0100)]
Use %x instead of %lx where appropriate.
Some conversions were not properly merged from the master branch.
Guus Sliepen [Wed, 4 Nov 2009 15:18:08 +0000 (16:18 +0100)]
Don't enable device events when there is no valid filedescriptor.
Guus Sliepen [Mon, 2 Nov 2009 13:24:27 +0000 (14:24 +0100)]
Merge branch 'master' into 1.1
Conflicts:
NEWS
README
configure.in
doc/tinc.texi
doc/tincd.8.in
src/Makefile.am
src/connection.c
src/edge.c
src/meta.c
src/net.c
src/net.h
src/net_packet.c
src/net_setup.c
src/net_socket.c
src/node.c
src/openssl/rsagen.h
src/protocol_auth.c
src/protocol_edge.c
src/subnet.c
Guus Sliepen [Sun, 1 Nov 2009 15:24:39 +0000 (16:24 +0100)]
Releasing 1.0.11.
Guus Sliepen [Sun, 1 Nov 2009 14:57:28 +0000 (15:57 +0100)]
Start a tinc service if it already exists.
Guus Sliepen [Tue, 27 Oct 2009 22:53:49 +0000 (23:53 +0100)]
Fast handoff of roaming MAC addresses.
In switch mode, if a known MAC address is claimed by a second node before it
expired at the first node, it is likely that this is because a computer has
roamed from the LAN of the first node to that of the second node. To ensure
packets for that computer are routed to the second node, the first node should
delete its corresponding Subnet as soon as possible, without waiting for the
normal expiry timeout.
Guus Sliepen [Sat, 24 Oct 2009 23:40:07 +0000 (01:40 +0200)]
Move socket error interpretation to utils.h.
Guus Sliepen [Sat, 24 Oct 2009 22:50:09 +0000 (00:50 +0200)]
Use WSAGetLastError() to determine cause of network errors on Windows.
This reduces log spam and lets path MTU discovery work faster.
Michael Tokarev [Sun, 18 Oct 2009 17:27:24 +0000 (21:27 +0400)]
Remove localedir leftovers.
Guus Sliepen [Sat, 24 Oct 2009 20:32:35 +0000 (22:32 +0200)]
Use IP_DONTFRAGMENT instead of IP_MTU_DISCOVER on Windows.
This ensures the DF bit on outgoing UDP packets gets set on Windows when path
MTU discovery is enabled, reducing fragmentation.
Guus Sliepen [Sat, 24 Oct 2009 19:53:01 +0000 (21:53 +0200)]
Forward packets to not directly reachable hosts via UDP if possible.
If MTU probing discovered a node was not reachable via UDP, packets for it were
forwarded to the next hop, but always via TCP, even if the next hop was
reachable via UDP. This is now fixed by retrying to send the packet using
send_packet() if the destination is not the same as the nexthop.
Guus Sliepen [Sat, 24 Oct 2009 19:35:40 +0000 (21:35 +0200)]
Make maxmtu equal to minmtu when fixing the path MTU to a node.
This ensures MTU probes used to ping nodes are not too large, and prevents
restarting MTU probing unnecessarily.
Guus Sliepen [Sat, 24 Oct 2009 19:32:06 +0000 (21:32 +0200)]
Always reply to MTU probes via UDP.
It could sometime happen that a node would return MTU probes via TCP, which
does not make a lot of sense.
Guus Sliepen [Sat, 24 Oct 2009 18:54:44 +0000 (20:54 +0200)]
Allow UDP packets with an address different from the corresponding TCP connection.
Guus Sliepen [Sat, 24 Oct 2009 14:15:24 +0000 (16:15 +0200)]
Use uint32_t instead of long int for connection options.
Options should have a fixed width anyway, but this also fixes a possible MinGW
compiler bug where %lx tries to print a 64 bit value, even though a long int is
only 32 bits.
Guus Sliepen [Sat, 24 Oct 2009 14:05:12 +0000 (16:05 +0200)]
Add dummy device.
Guus Sliepen [Tue, 20 Oct 2009 20:39:07 +0000 (22:39 +0200)]
Clarify and increase level of log message about MTU probes to unreachable nodes.
Guus Sliepen [Tue, 20 Oct 2009 20:33:16 +0000 (22:33 +0200)]
Handle weighted Subnets in switch and hub modes.
We now handle MAC Subnets in exactly the same way as IPv4 and IPv6 Subnets.
This also fixes a problem that causes unncessary broadcasting of unicast
packets in VPNs where some daemons run 1.0.10 and some run other versions.
Guus Sliepen [Tue, 20 Oct 2009 20:22:59 +0000 (22:22 +0200)]
Starting to work towards 1.0.11.
Guus Sliepen [Tue, 20 Oct 2009 20:14:47 +0000 (22:14 +0200)]
Fix a possible crash when sending the HUP signal.
When the HUP signal is sent while some outgoing connections have not been made
yet, or are being retried, a NULL pointer could be dereferenced resulting in
tinc crashing. We fix this by more careful handling of outgoing_ts, and by
deleting all connections that have not been fully activated yet at the HUP
signal is received.
Guus Sliepen [Sun, 18 Oct 2009 14:45:13 +0000 (16:45 +0200)]
Releasing 1.0.10.
Guus Sliepen [Sun, 18 Oct 2009 14:44:32 +0000 (16:44 +0200)]
Fix description of the WEIGHT environment variable.
Guus Sliepen [Sun, 18 Oct 2009 12:22:20 +0000 (14:22 +0200)]
Include missing header.