Send broadcast packets using a random socket, and properly support IPv6.

[tinc] / src / net_packet.c

diff --git a/src/net_packet.c b/src/net_packet.c
index c61bc60..2abe16e 100644 (file)
--- a/src/net_packet.c
+++ b/src/net_packet.c
@@ -151,7 +151,7 @@ static void send_mtu_probe_handler(int fd, short events, void *data) {
        }
 
 end:
-       event_add(&n->mtuevent, &(struct timeval){timeout, 0});
+       event_add(&n->mtuevent, &(struct timeval){timeout, rand() % 100000});
 }
 
 void send_mtu_probe(node_t *n) {
@@ -536,16 +536,26 @@ static void send_udppacket(node_t *n, vpn_packet_t *origpkt) {
 
        sockaddr_t *sa;
        int sock;
+       sockaddr_t broadcast;
 
        /* Overloaded use of priority field: -1 means local broadcast */
 
        if(origpriority == -1 && n->prevedge) {
-               sockaddr_t broadcast;
-               broadcast.in.sin_family = AF_INET;
-               broadcast.in.sin_addr.s_addr = -1;
-               broadcast.in.sin_port = n->prevedge->address.in.sin_port;
+               sock = rand() % listen_sockets;
+               memset(&broadcast, 0, sizeof broadcast);
+               if(listen_socket[sock].sa.sa.sa_family == AF_INET6) {
+                       broadcast.in6.sin6_family = AF_INET6;
+                       broadcast.in6.sin6_addr.s6_addr[0x0] = 0xff;
+                       broadcast.in6.sin6_addr.s6_addr[0x1] = 0x02;
+                       broadcast.in6.sin6_addr.s6_addr[0xf] = 0x01;
+                       broadcast.in6.sin6_port = n->prevedge->address.in.sin_port;
+                       broadcast.in6.sin6_scope_id = listen_socket[sock].sa.in6.sin6_scope_id;
+               } else {
+                       broadcast.in.sin_family = AF_INET;
+                       broadcast.in.sin_addr.s_addr = -1;
+                       broadcast.in.sin_port = n->prevedge->address.in.sin_port;
+               }
                sa = &broadcast;
-               sock = 0;
        } else {
                if(origpriority == -1)
                        origpriority = 0;
@@ -674,9 +684,11 @@ bool receive_sptps_record(void *handle, uint8_t type, const char *data, uint16_t
        node_t *from = handle;
 
        if(type == SPTPS_HANDSHAKE) {
-               from->status.validkey = true;
-               from->status.waitingforkey = false;
-               logger(DEBUG_META, LOG_INFO, "SPTPS key exchange with %s (%s) succesful", from->name, from->hostname);
+               if(!from->status.validkey) {
+                       from->status.validkey = true;
+                       from->status.waitingforkey = false;
+                       logger(DEBUG_META, LOG_INFO, "SPTPS key exchange with %s (%s) succesful", from->name, from->hostname);
+               }
                return true;
        }