diff options
| author | Rémi Denis-Courmont <remi.denis-courmont@nokia.com> | 2010-09-15 12:30:13 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-09-15 21:31:33 -0700 |
| commit | b6a563b2af4ec5b0363cf89869ba234c0e2cd3da (patch) | |
| tree | de4a7c16d3dc1efb93401b1862a94b7777f66523 /net/phonet | |
| parent | 7417fa83c1a8b75a03bd9b9b358999f38e771eab (diff) | |
| download | linux-b6a563b2af4ec5b0363cf89869ba234c0e2cd3da.tar.gz linux-b6a563b2af4ec5b0363cf89869ba234c0e2cd3da.tar.bz2 linux-b6a563b2af4ec5b0363cf89869ba234c0e2cd3da.zip | |
Phonet: look up the resource routing table when forwarding
Signed-off-by: Rémi Denis-Courmont <remi.denis-courmont@nokia.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/phonet')
| -rw-r--r-- | net/phonet/af_phonet.c | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/net/phonet/af_phonet.c b/net/phonet/af_phonet.c index 73aee7f2fcdc..fd95beb72f5d 100644 --- a/net/phonet/af_phonet.c +++ b/net/phonet/af_phonet.c @@ -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 */ |