tipc: add second source address to recvmsg()/recvfrom()
With group communication, it becomes important for a message receiver to identify not only from which socket (identfied by a node:port tuple) the message was sent, but also the logical identity (type:instance) of the sending member. We fix this by adding a second instance of struct sockaddr_tipc to the source address area when a message is read. The extra address struct is filled in with data found in the received message header (type,) and in the local member representation struct (instance.) Signed-off-by: Jon Maloy <jon.maloy@ericsson.com> Acked-by: Ying Xue <ying.xue@windriver.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
75da2163db
commit
31c82a2d9d
|
@ -61,6 +61,7 @@ struct tipc_member {
|
||||||
struct list_head list;
|
struct list_head list;
|
||||||
u32 node;
|
u32 node;
|
||||||
u32 port;
|
u32 port;
|
||||||
|
u32 instance;
|
||||||
enum mbr_state state;
|
enum mbr_state state;
|
||||||
u16 bc_rcv_nxt;
|
u16 bc_rcv_nxt;
|
||||||
};
|
};
|
||||||
|
@ -282,6 +283,7 @@ void tipc_group_filter_msg(struct tipc_group *grp, struct sk_buff_head *inputq,
|
||||||
if (!tipc_group_is_receiver(m))
|
if (!tipc_group_is_receiver(m))
|
||||||
goto drop;
|
goto drop;
|
||||||
|
|
||||||
|
TIPC_SKB_CB(skb)->orig_member = m->instance;
|
||||||
__skb_queue_tail(inputq, skb);
|
__skb_queue_tail(inputq, skb);
|
||||||
|
|
||||||
m->bc_rcv_nxt = msg_grp_bc_seqno(hdr) + 1;
|
m->bc_rcv_nxt = msg_grp_bc_seqno(hdr) + 1;
|
||||||
|
@ -388,6 +390,7 @@ void tipc_group_member_evt(struct tipc_group *grp,
|
||||||
m->state = MBR_PUBLISHED;
|
m->state = MBR_PUBLISHED;
|
||||||
else
|
else
|
||||||
m->state = MBR_JOINED;
|
m->state = MBR_JOINED;
|
||||||
|
m->instance = evt->found_lower;
|
||||||
tipc_group_proto_xmit(grp, m, GRP_JOIN_MSG, xmitq);
|
tipc_group_proto_xmit(grp, m, GRP_JOIN_MSG, xmitq);
|
||||||
} else if (evt->event == TIPC_WITHDRAWN) {
|
} else if (evt->event == TIPC_WITHDRAWN) {
|
||||||
if (!m)
|
if (!m)
|
||||||
|
|
|
@ -100,6 +100,7 @@ struct plist;
|
||||||
|
|
||||||
struct tipc_skb_cb {
|
struct tipc_skb_cb {
|
||||||
u32 bytes_read;
|
u32 bytes_read;
|
||||||
|
u32 orig_member;
|
||||||
struct sk_buff *tail;
|
struct sk_buff *tail;
|
||||||
bool validated;
|
bool validated;
|
||||||
u16 chain_imp;
|
u16 chain_imp;
|
||||||
|
|
|
@ -62,6 +62,11 @@ enum {
|
||||||
TIPC_CONNECTING = TCP_SYN_SENT,
|
TIPC_CONNECTING = TCP_SYN_SENT,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
struct sockaddr_pair {
|
||||||
|
struct sockaddr_tipc sock;
|
||||||
|
struct sockaddr_tipc member;
|
||||||
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* struct tipc_sock - TIPC socket structure
|
* struct tipc_sock - TIPC socket structure
|
||||||
* @sk: socket - interacts with 'port' and with user via the socket API
|
* @sk: socket - interacts with 'port' and with user via the socket API
|
||||||
|
@ -1222,26 +1227,38 @@ static void tipc_sk_finish_conn(struct tipc_sock *tsk, u32 peer_port,
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* set_orig_addr - capture sender's address for received message
|
* tipc_sk_set_orig_addr - capture sender's address for received message
|
||||||
* @m: descriptor for message info
|
* @m: descriptor for message info
|
||||||
* @msg: received message header
|
* @hdr: received message header
|
||||||
*
|
*
|
||||||
* Note: Address is not captured if not requested by receiver.
|
* Note: Address is not captured if not requested by receiver.
|
||||||
*/
|
*/
|
||||||
static void set_orig_addr(struct msghdr *m, struct tipc_msg *msg)
|
static void tipc_sk_set_orig_addr(struct msghdr *m, struct sk_buff *skb)
|
||||||
{
|
{
|
||||||
DECLARE_SOCKADDR(struct sockaddr_tipc *, addr, m->msg_name);
|
DECLARE_SOCKADDR(struct sockaddr_pair *, srcaddr, m->msg_name);
|
||||||
|
struct tipc_msg *hdr = buf_msg(skb);
|
||||||
|
|
||||||
if (addr) {
|
if (!srcaddr)
|
||||||
addr->family = AF_TIPC;
|
return;
|
||||||
addr->addrtype = TIPC_ADDR_ID;
|
|
||||||
memset(&addr->addr, 0, sizeof(addr->addr));
|
srcaddr->sock.family = AF_TIPC;
|
||||||
addr->addr.id.ref = msg_origport(msg);
|
srcaddr->sock.addrtype = TIPC_ADDR_ID;
|
||||||
addr->addr.id.node = msg_orignode(msg);
|
srcaddr->sock.addr.id.ref = msg_origport(hdr);
|
||||||
addr->addr.name.domain = 0; /* could leave uninitialized */
|
srcaddr->sock.addr.id.node = msg_orignode(hdr);
|
||||||
addr->scope = 0; /* could leave uninitialized */
|
srcaddr->sock.addr.name.domain = 0;
|
||||||
m->msg_namelen = sizeof(struct sockaddr_tipc);
|
srcaddr->sock.scope = 0;
|
||||||
}
|
m->msg_namelen = sizeof(struct sockaddr_tipc);
|
||||||
|
|
||||||
|
if (!msg_in_group(hdr))
|
||||||
|
return;
|
||||||
|
|
||||||
|
/* Group message users may also want to know sending member's id */
|
||||||
|
srcaddr->member.family = AF_TIPC;
|
||||||
|
srcaddr->member.addrtype = TIPC_ADDR_NAME;
|
||||||
|
srcaddr->member.addr.name.name.type = msg_nametype(hdr);
|
||||||
|
srcaddr->member.addr.name.name.instance = TIPC_SKB_CB(skb)->orig_member;
|
||||||
|
srcaddr->member.addr.name.domain = 0;
|
||||||
|
m->msg_namelen = sizeof(*srcaddr);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -1432,7 +1449,7 @@ static int tipc_recvmsg(struct socket *sock, struct msghdr *m,
|
||||||
} while (1);
|
} while (1);
|
||||||
|
|
||||||
/* Collect msg meta data, including error code and rejected data */
|
/* Collect msg meta data, including error code and rejected data */
|
||||||
set_orig_addr(m, hdr);
|
tipc_sk_set_orig_addr(m, skb);
|
||||||
rc = tipc_sk_anc_data_recv(m, hdr, tsk);
|
rc = tipc_sk_anc_data_recv(m, hdr, tsk);
|
||||||
if (unlikely(rc))
|
if (unlikely(rc))
|
||||||
goto exit;
|
goto exit;
|
||||||
|
@ -1526,7 +1543,7 @@ static int tipc_recvstream(struct socket *sock, struct msghdr *m,
|
||||||
|
|
||||||
/* Collect msg meta data, incl. error code and rejected data */
|
/* Collect msg meta data, incl. error code and rejected data */
|
||||||
if (!copied) {
|
if (!copied) {
|
||||||
set_orig_addr(m, hdr);
|
tipc_sk_set_orig_addr(m, skb);
|
||||||
rc = tipc_sk_anc_data_recv(m, hdr, tsk);
|
rc = tipc_sk_anc_data_recv(m, hdr, tsk);
|
||||||
if (rc)
|
if (rc)
|
||||||
break;
|
break;
|
||||||
|
|
Loading…
Reference in a new issue