]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
Bluetooth: 6lowpan: search for destination address in all peers
authorJosua Mayer <josua.mayer@jm0.eu>
Sat, 6 Jul 2019 15:54:46 +0000 (17:54 +0200)
committerMarcel Holtmann <marcel@holtmann.org>
Sat, 6 Jul 2019 19:33:55 +0000 (21:33 +0200)
Handle overlooked case where the target address is assigned to a peer
and neither route nor gateway exist.

For one peer, no checks are performed to see if it is meant to receive
packets for a given address.

As soon as there is a second peer however, checks are performed
to deal with routes and gateways for handling complex setups with
multiple hops to a target address.
This logic assumed that no route and no gateway imply that the
destination address can not be reached, which is false in case of a
direct peer.

Acked-by: Jukka Rissanen <jukka.rissanen@linux.intel.com>
Tested-by: Michael Scott <mike@foundries.io>
Signed-off-by: Josua Mayer <josua.mayer@jm0.eu>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
net/bluetooth/6lowpan.c

index 1555b0c6f7ecf355d8e4e1d22517347a7fee565f..9001bf331d56d366d51e0756cd388801a347d4d9 100644 (file)
@@ -180,10 +180,16 @@ static inline struct lowpan_peer *peer_lookup_dst(struct lowpan_btle_dev *dev,
        }
 
        if (!rt) {
-               nexthop = &lowpan_cb(skb)->gw;
-
-               if (ipv6_addr_any(nexthop))
-                       return NULL;
+               if (ipv6_addr_any(&lowpan_cb(skb)->gw)) {
+                       /* There is neither route nor gateway,
+                        * probably the destination is a direct peer.
+                        */
+                       nexthop = daddr;
+               } else {
+                       /* There is a known gateway
+                        */
+                       nexthop = &lowpan_cb(skb)->gw;
+               }
        } else {
                nexthop = rt6_nexthop(rt, daddr);