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

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

Phonet: implement per-socket destination/peer address 



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

include/net/phonet/phonet.h

+1 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ 
struct pn_sock {

	struct sock	sk;

	u16		sobject;

	u16		dobject;

	u8		resource;

};

net/phonet/af_phonet.c

+14 −5
Original line number Diff line number Diff line
@@ -110,6 +110,7 @@ static int pn_socket_create(struct net *net, struct socket *sock, int protocol, 
	sk->sk_protocol = protocol;

	pn = pn_sk(sk);

	pn->sobject = 0;

	pn->dobject = 0;

	pn->resource = 0;

	sk->sk_prot->init(sk);

	err = 0;
@@ -242,8 +243,18 @@ int pn_skb_send(struct sock *sk, struct sk_buff *skb, 
	struct net_device *dev;

	struct pn_sock *pn = pn_sk(sk);

	int err;

	u16 src;

	u8 daddr = pn_sockaddr_get_addr(target), saddr = PN_NO_ADDR;

	u16 src, dst;

	u8 daddr, saddr, res;



	src = pn->sobject;

	if (target != NULL) {

		dst = pn_sockaddr_get_object(target);

		res = pn_sockaddr_get_resource(target);

	} else {

		dst = pn->dobject;

		res = pn->resource;

	}

	daddr = pn_addr(dst);



	err = -EHOSTUNREACH;

	if (sk->sk_bound_dev_if)
@@ -271,12 +282,10 @@ int pn_skb_send(struct sock *sk, struct sk_buff *skb, 
	if (saddr == PN_NO_ADDR)

		goto drop;



	src = pn->sobject;

	if (!pn_addr(src))

		src = pn_object(saddr, pn_obj(src));



	err = pn_send(skb, dev, pn_sockaddr_get_object(target),

			src, pn_sockaddr_get_resource(target), 0);

	err = pn_send(skb, dev, dst, src, res, 0);

	dev_put(dev);

	return err;

net/phonet/socket.c

+2 −2
Original line number Diff line number Diff line
@@ -633,8 +633,8 @@ static int pn_sock_seq_show(struct seq_file *seq, void *v) 


		seq_printf(seq, "%2d %04X:%04X:%02X %02X %08X:%08X %5d %lu "

			"%d %p %d%n",

			sk->sk_protocol, pn->sobject, 0, pn->resource,

			sk->sk_state,

			sk->sk_protocol, pn->sobject, pn->dobject,

			pn->resource, sk->sk_state,

			sk_wmem_alloc_get(sk), sk_rmem_alloc_get(sk),

			sock_i_uid(sk), sock_i_ino(sk),

			atomic_read(&sk->sk_refcnt), sk,