Replace the connection_tree with a connection_list.

[tinc] / src / net_packet.c

diff --git a/src/net_packet.c b/src/net_packet.c
index 371632f..c9a6663 100644 (file)
--- a/src/net_packet.c
+++ b/src/net_packet.c
@@ -36,7 +36,6 @@
 #include LZO1X_H
 #endif
 
-#include "splay_tree.h"
 #include "cipher.h"
 #include "conf.h"
 #include "connection.h"
@@ -398,6 +397,7 @@ static void send_sptps_packet(node_t *n, vpn_packet_t *origpkt) {
                        n->status.waitingforkey = false;
                        send_req_key(n);
                }
+               return;
        }
 
        uint8_t type = 0;
@@ -590,13 +590,15 @@ end:
 bool send_sptps_data(void *handle, uint8_t type, const char *data, size_t len) {
        node_t *to = handle;
 
-       if(type >= SPTPS_HANDSHAKE || ((myself->options | to->options) & OPTION_TCPONLY)) {
+       if(type >= SPTPS_HANDSHAKE
+                       || ((myself->options | to->options) & OPTION_TCPONLY)
+                       || (type != PKT_PROBE && len > to->minmtu)) {
                char buf[len * 4 / 3 + 5];
                b64encode(data, buf, len);
                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
-                       return send_request(to->nexthop->connection, "%d %s %s %d %s", REQ_KEY, myself->name, to->name, REQ_SPTPS, buf);
+                       return send_request(to->nexthop->connection, "%d %s %s %d %s", REQ_KEY, myself->name, to->name, type >= SPTPS_HANDSHAKE ? REQ_SPTPS : REQ_PACKET, buf);
        }
 
        /* Send the packet */
@@ -747,10 +749,6 @@ void send_packet(node_t *n, vpn_packet_t *packet) {
 /* Broadcast a packet using the minimum spanning tree */
 
 void broadcast_packet(const node_t *from, vpn_packet_t *packet) {
-       splay_node_t *node;
-       connection_t *c;
-       node_t *n;
-
        // Always give ourself a copy of the packet.
        if(from != myself)
                send_packet(myself, packet);
@@ -768,8 +766,9 @@ void broadcast_packet(const node_t *from, vpn_packet_t *packet) {
                // This guarantees all nodes receive the broadcast packet, and
                // usually distributes the sending of broadcast packets over all nodes.
                case BMODE_MST:
-                       for(node = connection_tree->head; node; node = node->next) {
-                               c = node->data;
+                       for(list_node_t *node = connection_list->head, *next; node; node = next) {
+                               next = node->next;
+                               connection_t *c = node->data;
 
                                if(c->status.active && c->status.mst && c != from->nexthop->connection)
                                        send_packet(c->node, packet);
@@ -783,8 +782,8 @@ void broadcast_packet(const node_t *from, vpn_packet_t *packet) {
                        if(from != myself)
                                break;
 
-                       for(node = node_tree->head; node; node = node->next) {
-                               n = node->data;
+                       for(splay_node_t *node = node_tree->head; node; node = node->next) {
+                               node_t *n = node->data;
 
                                if(n->status.reachable && ((n->via == myself && n->nexthop == n) || n->via == n))
                                        send_packet(n, packet);