Allow Cipher and Digest "none".

[tinc] / src / net_packet.c

diff --git a/src/net_packet.c b/src/net_packet.c
index 1254e48..70b6106 100644 (file)
--- a/src/net_packet.c
+++ b/src/net_packet.c
@@ -42,7 +42,6 @@
 #include "net.h"
 #include "netutl.h"
 #include "protocol.h"
-#include "process.h"
 #include "route.h"
 #include "utils.h"
 #include "xalloc.h"
@@ -144,16 +143,15 @@ static void send_mtu_probe_handler(void *data) {
                memset(packet.data, 0, 14);
                randomize(packet.data + 14, len - 14);
                packet.len = len;
-               if(i >= 4 && n->mtuprobes <= 10)
-                       packet.priority = -1;
-               else
-                       packet.priority = 0;
+               packet.priority = 0;
+               n->status.broadcast = i >= 4 && n->mtuprobes <= 10 && n->prevedge;
 
                logger(DEBUG_TRAFFIC, LOG_INFO, "Sending MTU probe length %d to %s (%s)", len, n->name, n->hostname);
 
                send_udppacket(n, &packet);
        }
 
+       n->status.broadcast = false;
        n->probe_counter = 0;
        gettimeofday(&n->probe_time, NULL);
 
@@ -380,7 +378,7 @@ static void receive_udppacket(node_t *n, vpn_packet_t *inpkt) {
                return;
        }
 
-       if(!cipher_active(n->incipher)) {
+       if(!n->status.validkey) {
                logger(DEBUG_TRAFFIC, LOG_DEBUG, "Got packet from %s (%s) but he hasn't got our key yet", n->name, n->hostname);
                return;
        }
@@ -735,9 +733,7 @@ static void send_udppacket(node_t *n, vpn_packet_t *origpkt) {
        const sockaddr_t *sa;
        int sock;
 
-       /* Overloaded use of priority field: -1 means local broadcast */
-
-       if(origpriority == -1 && n->prevedge)
+       if(n->status.broadcast)
                choose_broadcast_address(n, &sa, &sock);
        else
                choose_udp_address(n, &sa, &sock);
@@ -771,15 +767,17 @@ bool send_sptps_data(void *handle, uint8_t type, const char *data, size_t len) {
 
        /* Send it via TCP if it is a handshake packet, TCPOnly is in use, or this packet is larger than the MTU. */
 
-       if(type >= SPTPS_HANDSHAKE || ((myself->options | to->options) & OPTION_TCPONLY) || (type != PKT_PROBE && len > to->minmtu)) {
+       if(type >= SPTPS_HANDSHAKE || ((myself->options | to->options) & OPTION_TCPONLY) || (type != PKT_PROBE && (len - SPTPS_DATAGRAM_OVERHEAD) > to->minmtu)) {
                char buf[len * 4 / 3 + 5];
                b64encode(data, buf, len);
                /* If no valid key is known yet, send the packets using ANS_KEY requests,
                   to ensure we get to learn the reflexive UDP address. */
-               if(!to->status.validkey)
-                       return send_request(to->nexthop->connection, "%d %s %s %s -1 -1 -1 %d", ANS_KEY, myself->name, to->name, buf, myself->incompression);
-               else
+               if(!to->status.validkey) {
+                       to->incompression = myself->incompression;
+                       return send_request(to->nexthop->connection, "%d %s %s %s -1 -1 -1 %d", ANS_KEY, myself->name, to->name, buf, to->incompression);
+               } else {
                        return send_request(to->nexthop->connection, "%d %s %s %d %s", REQ_KEY, myself->name, to->name, REQ_SPTPS, buf);
+               }
        }
 
        /* Otherwise, send the packet via UDP */
@@ -787,10 +785,15 @@ bool send_sptps_data(void *handle, uint8_t type, const char *data, size_t len) {
        const sockaddr_t *sa;
        int sock;
 
-       choose_udp_address(to, &sa, &sock);
+       if(to->status.broadcast)
+               choose_broadcast_address(to, &sa, &sock);
+       else
+               choose_udp_address(to, &sa, &sock);
 
        if(sendto(listen_socket[sock].udp.fd, data, len, 0, &sa->sa, SALEN(sa->sa)) < 0 && !sockwouldblock(sockerrno)) {
                if(sockmsgsize(sockerrno)) {
+                       // Compensate for SPTPS overhead
+                       len -= SPTPS_DATAGRAM_OVERHEAD;
                        if(to->maxmtu >= len)
                                to->maxmtu = len - 1;
                        if(to->mtu >= len)
@@ -959,7 +962,7 @@ void broadcast_packet(const node_t *from, vpn_packet_t *packet) {
                                break;
 
                        for splay_each(node_t, n, node_tree)
-                               if(n->status.reachable && ((n->via == myself && n->nexthop == n) || n->via == n))
+                               if(n->status.reachable && n != myself && ((n->via == myself && n->nexthop == n) || n->via == n))
                                        send_packet(n, packet);
                        break;