Make sure PriorityInheritance also works in switch mode.

[tinc] / src / net_packet.c

diff --git a/src/net_packet.c b/src/net_packet.c
index 43c8ce2..2780f51 100644 (file)
--- a/src/net_packet.c
+++ b/src/net_packet.c
@@ -500,17 +500,27 @@ static void send_udppacket(node_t *n, vpn_packet_t *origpkt) {
        struct sockaddr *sa;
        socklen_t sl;
        int sock;
+       sockaddr_t broadcast;
 
        /* Overloaded use of priority field: -1 means local broadcast */
 
        if(origpriority == -1 && n->prevedge) {
-               struct sockaddr_in in;
-               in.sin_family = AF_INET;
-               in.sin_addr.s_addr = -1;
-               in.sin_port = n->prevedge->address.in.sin_port;
-               sa = (struct sockaddr *)∈
-               sl = sizeof in;
-               sock = 0;
+               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.sa;
+               sl = SALEN(broadcast.sa);
        } else {
                if(origpriority == -1)
                        origpriority = 0;
@@ -622,7 +632,7 @@ void broadcast_packet(const node_t *from, vpn_packet_t *packet) {
                                n = node->data;
 
                                if(n->status.reachable && ((n->via == myself && n->nexthop == n) || n->via == n))
-                                       send_packet(c->node, packet);
+                                       send_packet(n, packet);
                        }
                        break;