Use only rand(), not random().

[oweals/tinc.git] / src / net_packet.c

diff --git a/src/net_packet.c b/src/net_packet.c
index 28cf161e21e78e6c05c84835c572113800cc56bf..2be599ebc6d3aa7a969a45d881ad858d22f68b6c 100644 (file)
--- a/src/net_packet.c
+++ b/src/net_packet.c
@@ -70,6 +70,11 @@ void send_mtu_probe(node_t *n)
        n->mtuprobes++;
        n->mtuevent = NULL;
 
+       if(!n->status.reachable) {
+               logger(LOG_DEBUG, _("Trying to send MTU probe to unreachable node %s (%s)"), n->name, n->hostname);
+               return;
+       }
+
        if(n->mtuprobes >= 10 && !n->minmtu) {
                ifdebug(TRAFFIC) logger(LOG_INFO, _("No response to MTU probes from %s (%s)"), n->name, n->hostname);
                return;
@@ -82,7 +87,7 @@ void send_mtu_probe(node_t *n)
                        return;
                }
 
-               len = n->minmtu + 1 + random() % (n->maxmtu - n->minmtu);
+               len = n->minmtu + 1 + rand() % (n->maxmtu - n->minmtu);
                if(len < 64)
                        len = 64;
                
@@ -328,6 +333,11 @@ static void send_udppacket(node_t *n, vpn_packet_t *origpkt)
 
        cp();
 
+       if(!n->status.reachable) {
+               ifdebug(TRAFFIC) logger(LOG_INFO, _("Trying to send UDP packet to unreachable node %s (%s)"), n->name, n->hostname);
+               return;
+       }
+
        /* Make sure we have a valid key */
 
        if(!n->status.validkey) {
@@ -488,9 +498,15 @@ void broadcast_packet(const node_t *from, vpn_packet_t *packet)
        ifdebug(TRAFFIC) logger(LOG_INFO, _("Broadcasting packet of %d bytes from %s (%s)"),
                           packet->len, from->name, from->hostname);
 
-       if(from != myself)
+       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)
+                       return;
+       }
+
        for(node = connection_tree->head; node; node = node->next) {
                c = node->data;
 
@@ -536,7 +552,8 @@ void handle_incoming_vpn_data(int sock)
        pkt.len = recvfrom(sock, (char *) &pkt.seqno, MAXSIZE, 0, &from.sa, &fromlen);
 
        if(pkt.len < 0) {
-               logger(LOG_ERR, _("Receiving packet failed: %s"), strerror(errno));
+               if(errno != EAGAIN && errno != EINTR)
+                       logger(LOG_ERR, _("Receiving packet failed: %s"), strerror(errno));
                return;
        }