iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tipc: remove tsk->connected for connectionless sockets

Browse Source 
Until now, for connectionless sockets the peer information during
connect is stored in tsk->peer and a connection state is set in
tsk->connected. This is redundant.

In this commit, for connectionless sockets we update:
- __tipc_sendmsg(), when the destination is NULL the peer existence
  is determined by tsk->peer.family, instead of tsk->connected.
- tipc_connect(), remove set/unset of tsk->connected.
Hence tsk->connected is no longer used for connectionless sockets.

There is no functional change in this commit.

Acked-by: Ying Xue <ying.xue@windriver.com>
Acked-by: Jon Maloy <jon.maloy@ericsson.com>
Signed-off-by: Parthasarathy Bhuvaragan <parthasarathy.bhuvaragan@ericsson.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Parthasarathy Bhuvaragan
2016-11-01 14:02:39 +01:00
committed by David S. Miller
parent aeda16b6ae
commit 87227fe7e4
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
net/tipc/socket.c
View File

@ -902,7 +902,7 @@ static int __tipc_sendmsg(struct socket *sock, struct msghdr *m, size_t dsz)
if (dsz > TIPC_MAX_USER_MSG_SIZE) if (dsz > TIPC_MAX_USER_MSG_SIZE)
return -EMSGSIZE; return -EMSGSIZE;
if (unlikely(!dest)) { if (unlikely(!dest)) {
if (tsk->connected && sock->state == SS_READY) if (sock->state == SS_READY && tsk->peer.family == AF_TIPC)
dest = &tsk->peer; dest = &tsk->peer;
else else
return -EDESTADDRREQ; return -EDESTADDRREQ;
@ -1939,12 +1939,10 @@ static int tipc_connect(struct socket *sock, struct sockaddr *dest,
if (sock->state == SS_READY) { if (sock->state == SS_READY) {
if (dst->family == AF_UNSPEC) { if (dst->family == AF_UNSPEC) {
memset(&tsk->peer, 0, sizeof(struct sockaddr_tipc)); memset(&tsk->peer, 0, sizeof(struct sockaddr_tipc));
tsk->connected = 0;
} else if (destlen != sizeof(struct sockaddr_tipc)) { } else if (destlen != sizeof(struct sockaddr_tipc)) {
res = -EINVAL; res = -EINVAL;
} else { } else {
memcpy(&tsk->peer, dest, destlen); memcpy(&tsk->peer, dest, destlen);
tsk->connected = 1;
} }
goto exit; goto exit;
} }