Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b6a563b2 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont Committed by David S. Miller
Browse files

Phonet: look up the resource routing table when forwarding 



Signed-off-by: default avatarRémi Denis-Courmont <remi.denis-courmont@nokia.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7417fa83

net/phonet/af_phonet.c

+17 −0
Original line number Diff line number Diff line
@@ -251,6 +251,16 @@ int pn_skb_send(struct sock *sk, struct sk_buff *skb, 
	else if (phonet_address_lookup(net, daddr) == 0) {

		dev = phonet_device_get(net);

		skb->pkt_type = PACKET_LOOPBACK;

	} else if (pn_sockaddr_get_object(target) == 0) {

		/* Resource routing (small race until phonet_rcv()) */

		struct sock *sk = pn_find_sock_by_res(net,

							target->spn_resource);

		if (sk)	{

			sock_put(sk);

			dev = phonet_device_get(net);

			skb->pkt_type = PACKET_LOOPBACK;

		} else

			dev = phonet_route_output(net, daddr);

	} else

		dev = phonet_route_output(net, daddr);
@@ -383,6 +393,13 @@ static int phonet_rcv(struct sk_buff *skb, struct net_device *dev, 
		goto out;

	}



	/* resource routing */

	if (pn_sockaddr_get_object(&sa) == 0) {

		struct sock *sk = pn_find_sock_by_res(net, sa.spn_resource);

		if (sk)

			return sk_receive_skb(sk, skb, 0);

	}



	/* check if we are the destination */

	if (phonet_address_lookup(net, pn_sockaddr_get_addr(&sa)) == 0) {

		/* Phonet packet input */