In this commit, we create a new tipc socket state TIPC_DISCONNECTING in
sk_state. We primarily replace the SS_DISCONNECTING sock->state with
TIPC_DISCONNECTING.
There is no functional change in this commit.
Acked-by: Ying Xue <ying....@windriver.com>
Signed-off-by: Parthasarathy Bhuvaragan <parthasarathy.bhuvara...@ericsson.com>
---
include/uapi/linux/tipc.h | 1 +
net/tipc/socket.c | 51 +++++++++++++++++++++++------------------------
2 files changed, 26 insertions(+), 26 deletions(-)
diff --git a/include/uapi/linux/tipc.h b/include/uapi/linux/tipc.h
index 8579bc9e4a24..ce344581f755 100644
--- a/include/uapi/linux/tipc.h
+++ b/include/uapi/linux/tipc.h
@@ -184,6 +184,7 @@ enum {
TIPC_PROBING,
TIPC_ESTABLISHED,
TIPC_UNCONNECTED,
+ TIPC_DISCONNECTING,
};
/*
diff --git a/net/tipc/socket.c b/net/tipc/socket.c
index c1eb6cd7c7d3..9cadaace98a9 100644
--- a/net/tipc/socket.c
+++ b/net/tipc/socket.c
@@ -348,6 +348,7 @@ static int tipc_set_state(struct sock *sk, int state)
switch (state) {
case TIPC_UNCONNECTED:
+ case TIPC_DISCONNECTING:
res = 0;
break;
case TIPC_LISTEN:
@@ -505,7 +506,7 @@ static int tipc_release(struct socket *sock)
* (which disconnects locally & sends a 'FIN+' to peer)
*/
dnode = tsk_peer_node(tsk);
- while (sock->state != SS_DISCONNECTING) {
+ while (sk->sk_state != TIPC_DISCONNECTING) {
skb = __skb_dequeue(&sk->sk_receive_queue);
if (skb == NULL)
break;
@@ -514,7 +515,7 @@ static int tipc_release(struct socket *sock)
else {
if ((sock->state == SS_CONNECTING) ||
(sock->state == SS_CONNECTED)) {
- sock->state = SS_DISCONNECTING;
+ tipc_set_state(sk, TIPC_DISCONNECTING);
tipc_node_remove_conn(net, dnode, tsk->portid);
}
tipc_sk_respond(sk, skb, TIPC_ERR_NO_PORT);
@@ -535,7 +536,7 @@ static int tipc_release(struct socket *sock)
}
/* Reject any messages that accumulated in backlog queue */
- sock->state = SS_DISCONNECTING;
+ tipc_set_state(sk, TIPC_DISCONNECTING);
release_sock(sk);
call_rcu(&tsk->rcu, tipc_sk_callback);
@@ -621,13 +622,14 @@ static int tipc_getname(struct socket *sock, struct
sockaddr *uaddr,
int *uaddr_len, int peer)
{
struct sockaddr_tipc *addr = (struct sockaddr_tipc *)uaddr;
- struct tipc_sock *tsk = tipc_sk(sock->sk);
- struct tipc_net *tn = net_generic(sock_net(sock->sk), tipc_net_id);
+ struct sock *sk = sock->sk;
+ struct tipc_sock *tsk = tipc_sk(sk);
+ struct tipc_net *tn = net_generic(sock_net(sk), tipc_net_id);
memset(addr, 0, sizeof(*addr));
if (peer) {
if ((sock->state != SS_CONNECTED) &&
- ((peer != 2) || (sock->state != SS_DISCONNECTING)))
+ ((peer != 2) || (sk->sk_state != TIPC_DISCONNECTING)))
return -ENOTCONN;
addr->addr.id.ref = tsk_peer_port(tsk);
addr->addr.id.node = tsk_peer_node(tsk);
@@ -711,9 +713,6 @@ static unsigned int tipc_poll(struct file *file, struct
socket *sock,
if (!skb_queue_empty(&sk->sk_receive_queue))
mask |= (POLLIN | POLLRDNORM);
break;
- case SS_DISCONNECTING:
- mask = (POLLIN | POLLRDNORM | POLLHUP);
- break;
default:
switch (sk->sk_state) {
case TIPC_UNCONNECTED:
@@ -724,6 +723,9 @@ static unsigned int tipc_poll(struct file *file, struct
socket *sock,
if (!skb_queue_empty(&sk->sk_receive_queue))
mask |= (POLLIN | POLLRDNORM);
break;
+ case TIPC_DISCONNECTING:
+ mask = (POLLIN | POLLRDNORM | POLLHUP);
+ break;
}
}
@@ -898,7 +900,7 @@ static int tipc_wait_for_sndmsg(struct socket *sock, long
*timeo_p)
int err = sock_error(sk);
if (err)
return err;
- if (sock->state == SS_DISCONNECTING)
+ if (sk->sk_state == TIPC_DISCONNECTING)
return -EPIPE;
if (!*timeo_p)
return -EAGAIN;
@@ -1053,7 +1055,7 @@ static int tipc_wait_for_sndpkt(struct socket *sock, long
*timeo_p)
int err = sock_error(sk);
if (err)
return err;
- if (sock->state == SS_DISCONNECTING)
+ if (sk->sk_state == TIPC_DISCONNECTING)
return -EPIPE;
else if (sock->state != SS_CONNECTED)
return -ENOTCONN;
@@ -1123,7 +1125,7 @@ static int __tipc_send_stream(struct socket *sock, struct
msghdr *m, size_t dsz)
return -EMSGSIZE;
if (unlikely(sock->state != SS_CONNECTED)) {
- if (sock->state == SS_DISCONNECTING)
+ if (sk->sk_state == TIPC_DISCONNECTING)
return -EPIPE;
else
return -ENOTCONN;
@@ -1348,7 +1350,7 @@ static int tipc_wait_for_rcvmsg(struct socket *sock, long
*timeop)
for (;;) {
prepare_to_wait(sk_sleep(sk), &wait, TASK_INTERRUPTIBLE);
if (timeo && skb_queue_empty(&sk->sk_receive_queue)) {
- if (sock->state == SS_DISCONNECTING) {
+ if (sk->sk_state == TIPC_DISCONNECTING) {
err = -ENOTCONN;
break;
}
@@ -1646,7 +1648,7 @@ static bool filter_connect(struct tipc_sock *tsk, struct
sk_buff *skb)
return false;
if (unlikely(msg_errcode(hdr))) {
- sock->state = SS_DISCONNECTING;
+ tipc_set_state(sk, TIPC_DISCONNECTING);
/* Let timer expire on it's own */
tipc_node_remove_conn(net, tsk_peer_node(tsk),
tsk->portid);
@@ -1660,13 +1662,13 @@ static bool filter_connect(struct tipc_sock *tsk,
struct sk_buff *skb)
return false;
if (unlikely(msg_errcode(hdr))) {
- sock->state = SS_DISCONNECTING;
+ tipc_set_state(sk, TIPC_DISCONNECTING);
sk->sk_err = ECONNREFUSED;
return true;
}
if (unlikely(!msg_isdata(hdr))) {
- sock->state = SS_DISCONNECTING;
+ tipc_set_state(sk, TIPC_DISCONNECTING);
sk->sk_err = EINVAL;
return true;
}
@@ -1687,12 +1689,11 @@ static bool filter_connect(struct tipc_sock *tsk,
struct sk_buff *skb)
msg_set_dest_droppable(hdr, 1);
return false;
- case SS_DISCONNECTING:
- break;
}
switch (sk->sk_state) {
case TIPC_UNCONNECTED:
+ case TIPC_DISCONNECTING:
break;
case TIPC_LISTEN:
/* Accept only SYN message */
@@ -2214,9 +2215,7 @@ static int tipc_shutdown(struct socket *sock, int how)
lock_sock(sk);
- switch (sock->state) {
- case SS_CONNECTING:
- case SS_CONNECTED:
+ if (sock->state == SS_CONNECTING || sock->state == SS_CONNECTED) {
restart:
dnode = tsk_peer_node(tsk);
@@ -2236,11 +2235,12 @@ restart:
TIPC_CONN_SHUTDOWN);
tipc_node_xmit_skb(net, skb, dnode, tsk->portid);
}
- sock->state = SS_DISCONNECTING;
+ tipc_set_state(sk, TIPC_DISCONNECTING);
tipc_node_remove_conn(net, dnode, tsk->portid);
- /* fall through */
+ }
- case SS_DISCONNECTING:
+ switch (sk->sk_state) {
+ case TIPC_DISCONNECTING:
/* Discard any unreceived messages */
__skb_queue_purge(&sk->sk_receive_queue);
@@ -2249,7 +2249,6 @@ restart:
sk->sk_state_change(sk);
res = 0;
break;
-
default:
res = -ENOTCONN;
}
@@ -2276,7 +2275,7 @@ static void tipc_sk_timeout(unsigned long data)
if (sk->sk_state == TIPC_PROBING) {
if (!sock_owned_by_user(sk)) {
- sk->sk_socket->state = SS_DISCONNECTING;
+ tipc_set_state(sk, TIPC_DISCONNECTING);
tipc_node_remove_conn(sock_net(sk), tsk_peer_node(tsk),
tsk_peer_port(tsk));
sk->sk_state_change(sk);
--
2.1.4
------------------------------------------------------------------------------
What NetFlow Analyzer can do for you? Monitors network bandwidth and traffic
patterns at an interface-level. Reveals which users, apps, and protocols are
consuming the most bandwidth. Provides multi-vendor support for NetFlow,
J-Flow, sFlow and other flows. Make informed decisions using capacity
planning reports. http://sdm.link/zohodev2dev
_______________________________________________
tipc-discussion mailing list
tipc-discussion@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/tipc-discussion
