Remove everything GPL that is not copyright Guus Sliepen, update copyright statements.

[meshlink] / src / net_packet.c

diff --git a/src/net_packet.c b/src/net_packet.c
index 26e4907140556c49025c24750cfd0113a71b1e9f..8ff8e61b75282b2c1d7e68064f2b757d7f9e8246 100644 (file)
--- a/src/net_packet.c
+++ b/src/net_packet.c
@@ -1,9 +1,6 @@
 /*
     net_packet.c -- Handles in- and outgoing VPN packets
-    Copyright (C) 1998-2005 Ivo Timmermans,
-                  2000-2013 Guus Sliepen <guus@tinc-vpn.org>
-                  2010      Timothy Redaelli <timothy@redaelli.eu>
-                  2010      Brandon Black <blblack@gmail.com>
+    Copyright (C) 2014 Guus Sliepen <guus@meshlink.io>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -26,36 +23,27 @@
 #include <zlib.h>
 #endif
 
-#ifdef HAVE_LZO
-#include LZO1X_H
-#endif
-
 #include "cipher.h"
 #include "conf.h"
 #include "connection.h"
 #include "crypto.h"
 #include "digest.h"
-#include "device.h"
-#include "ethernet.h"
 #include "graph.h"
 #include "logger.h"
 #include "net.h"
 #include "netutl.h"
 #include "protocol.h"
-#include "process.h"
 #include "route.h"
 #include "utils.h"
 #include "xalloc.h"
 
 int keylifetime = 0;
-#ifdef HAVE_LZO
-static char lzo_wrkmem[LZO1X_999_MEM_COMPRESS > LZO1X_1_MEM_COMPRESS ? LZO1X_999_MEM_COMPRESS : LZO1X_1_MEM_COMPRESS];
-#endif
 
 static void send_udppacket(node_t *, vpn_packet_t *);
 
 unsigned replaywin = 16;
 bool localdiscovery = false;
+sockaddr_t localdiscovery_address;
 
 #define MAX_SEQNO 1073741824
 
@@ -143,16 +131,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);
 
@@ -231,6 +218,7 @@ static void mtu_probe_h(node_t *n, vpn_packet_t *packet, length_t len) {
                struct timeval now, diff;
                gettimeofday(&now, NULL);
                timersub(&now, &n->probe_time, &diff);
+               
                n->probe_counter++;
 
                if(n->probe_counter == 1) {
@@ -248,13 +236,7 @@ static length_t compress_packet(uint8_t *dest, const uint8_t *source, length_t l
                memcpy(dest, source, len);
                return len;
        } else if(level == 10) {
-#ifdef HAVE_LZO
-               lzo_uint lzolen = MAXSIZE;
-               lzo1x_1_compress(source, len, dest, &lzolen, lzo_wrkmem);
-               return lzolen;
-#else
                return -1;
-#endif
        } else if(level < 10) {
 #ifdef HAVE_ZLIB
                unsigned long destlen = MAXSIZE;
@@ -264,13 +246,7 @@ static length_t compress_packet(uint8_t *dest, const uint8_t *source, length_t l
 #endif
                        return -1;
        } else {
-#ifdef HAVE_LZO
-               lzo_uint lzolen = MAXSIZE;
-               lzo1x_999_compress(source, len, dest, &lzolen, lzo_wrkmem);
-               return lzolen;
-#else
                return -1;
-#endif
        }
 
        return -1;
@@ -281,12 +257,6 @@ static length_t uncompress_packet(uint8_t *dest, const uint8_t *source, length_t
                memcpy(dest, source, len);
                return len;
        } else if(level > 9) {
-#ifdef HAVE_LZO
-               lzo_uint lzolen = MAXSIZE;
-               if(lzo1x_decompress_safe(source, len, dest, &lzolen, NULL) == LZO_E_OK)
-                       return lzolen;
-               else
-#endif
                        return -1;
        }
 #ifdef HAVE_ZLIB
@@ -390,11 +360,6 @@ static void receive_udppacket(node_t *n, vpn_packet_t *inpkt) {
        if(replaywin) {
                if(inpkt->seqno != n->received_seqno + 1) {
                        if(inpkt->seqno >= n->received_seqno + replaywin * 8) {
-                               if(n->farfuture++ < replaywin >> 2) {
-                                       logger(DEBUG_ALWAYS, LOG_WARNING, "Packet from %s (%s) is %d seqs in the future, dropped (%u)",
-                                               n->name, n->hostname, inpkt->seqno - n->received_seqno - 1, n->farfuture);
-                                       return;
-                               }
                                logger(DEBUG_ALWAYS, LOG_WARNING, "Lost %d packets from %s (%s)",
                                                inpkt->seqno - n->received_seqno - 1, n->name, n->hostname);
                                memset(n->late, 0, replaywin);
@@ -410,7 +375,6 @@ static void receive_udppacket(node_t *n, vpn_packet_t *inpkt) {
                        }
                }
 
-               n->farfuture = 0;
                n->late[(inpkt->seqno / 8) % replaywin] &= ~(1 << inpkt->seqno % 8);
        }
 
@@ -580,12 +544,22 @@ static void choose_broadcast_address(const node_t *n, const sockaddr_t **sa, int
        *sock = rand() % listen_sockets;
 
        if(listen_socket[*sock].sa.sa.sa_family == AF_INET6) {
-               broadcast_ipv6.in6.sin6_port = n->prevedge->address.in.sin_port;
-               broadcast_ipv6.in6.sin6_scope_id = listen_socket[*sock].sa.in6.sin6_scope_id;
-               *sa = &broadcast_ipv6;
+               if(localdiscovery_address.sa.sa_family == AF_INET6) {
+                       localdiscovery_address.in6.sin6_port = n->prevedge->address.in.sin_port;
+                       *sa = &localdiscovery_address;
+               } else {
+                       broadcast_ipv6.in6.sin6_port = n->prevedge->address.in.sin_port;
+                       broadcast_ipv6.in6.sin6_scope_id = listen_socket[*sock].sa.in6.sin6_scope_id;
+                       *sa = &broadcast_ipv6;
+               }
        } else {
-               broadcast_ipv4.in.sin_port = n->prevedge->address.in.sin_port;
-               *sa = &broadcast_ipv4;
+               if(localdiscovery_address.sa.sa_family == AF_INET) {
+                       localdiscovery_address.in.sin_port = n->prevedge->address.in.sin_port;
+                       *sa = &localdiscovery_address;
+               } else {
+                       broadcast_ipv4.in.sin_port = n->prevedge->address.in.sin_port;
+                       *sa = &broadcast_ipv4;
+               }
        }
 }
 
@@ -690,9 +664,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);
@@ -731,10 +703,12 @@ bool send_sptps_data(void *handle, uint8_t type, const char *data, size_t len) {
                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 */
@@ -742,7 +716,10 @@ 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)) {
@@ -843,11 +820,9 @@ void send_packet(node_t *n, vpn_packet_t *packet) {
        node_t *via;
 
        if(n == myself) {
-               if(overwrite_mac)
-                        memcpy(packet->data, mymac.x, ETH_ALEN);
                n->out_packets++;
                n->out_bytes += packet->len;
-               devops.write(packet);
+               // TODO: send to application
                return;
        }
 
@@ -888,11 +863,6 @@ void broadcast_packet(const node_t *from, vpn_packet_t *packet) {
        if(from != myself)
                send_packet(myself, packet);
 
-       // In TunnelServer mode, do not forward broadcast packets.
-       // The MST might not be valid and create loops.
-       if(tunnelserver || broadcast_mode == BMODE_NONE)
-               return;
-
        logger(DEBUG_TRAFFIC, LOG_INFO, "Broadcasting packet of %d bytes from %s (%s)",
                           packet->len, from->name, from->hostname);
 
@@ -914,7 +884,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;
 
@@ -993,15 +963,3 @@ void handle_incoming_vpn_data(void *data, int flags) {
 
        receive_udppacket(n, &pkt);
 }
-
-void handle_device_data(void *data, int flags) {
-       vpn_packet_t packet;
-
-       packet.priority = 0;
-
-       if(devops.read(&packet)) {
-               myself->in_packets++;
-               myself->in_bytes += packet.len;
-               route(myself, &packet);
-       }
-}