tipc: create TIPC_ESTABLISHED as a new sk_state

Until now, tipc maintains probing state for connected sockets in
tsk->probing_state variable.

In this commit, we express this information as socket states and
this remove the variable. We set probe_unacked flag when a probe
is sent out and reset it if we receive a reply. Instead of the
probing state TIPC_CONN_OK, we create a new state TIPC_ESTABLISHED.

There is no functional change in this commit.

Signed-off-by: Parthasarathy Bhuvaragan <parthasarathy.bhuvaragan@ericsson.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 11 insertions, 7 deletions

diff --git a/net/tipc/socket.c b/net/tipc/socket.c
index ce7d9be8833c..9215e2144b6a 100644
--- a/net/tipc/socket.c
+++ b/net/tipc/socket.c
@@ -47,13 +47,12 @@
 #define CONN_TIMEOUT_DEFAULT    8000    /* default connect timeout = 8s */
 #define CONN_PROBING_INTERVAL   msecs_to_jiffies(3600000)  /* [ms] => 1 h */
 #define TIPC_FWD_MSG            1
-#define TIPC_CONN_OK            0
-#define TIPC_CONN_PROBING       1
 #define TIPC_MAX_PORT           0xffffffff
 #define TIPC_MIN_PORT           1
 
 enum {
         TIPC_LISTEN = TCP_LISTEN,
+        TIPC_ESTABLISHED = TCP_ESTABLISHED,
 };
 
 /**
@@ -88,9 +87,9 @@ struct tipc_sock {
         struct list_head sock_list;
         struct list_head publications;
         u32 pub_count;
-        u32 probing_state;
         uint conn_timeout;
         atomic_t dupl_rcvcnt;
+        bool probe_unacked;
         bool link_cong;
         u16 snt_unacked;
         u16 snd_win;
@@ -356,6 +355,11 @@ static int tipc_set_sk_state(struct sock *sk, int state)
                 if (oldstate == SS_UNCONNECTED)
                         res = 0;
                 break;
+        case TIPC_ESTABLISHED:
+                if (oldstate == SS_CONNECTING ||
+                    oldstate == SS_UNCONNECTED)
+                        res = 0;
+                break;
         }
 
         if (!res)
@@ -858,7 +862,7 @@ static void tipc_sk_proto_rcv(struct tipc_sock *tsk, struct sk_buff *skb,
         if (!tsk_peer_msg(tsk, hdr))
                 goto exit;
 
-        tsk->probing_state = TIPC_CONN_OK;
+        tsk->probe_unacked = false;
 
         if (mtyp == CONN_PROBE) {
                 msg_set_type(hdr, CONN_PROBE_REPLY);
@@ -1198,8 +1202,8 @@ static void tipc_sk_finish_conn(struct tipc_sock *tsk, u32 peer_port,
         msg_set_lookup_scope(msg, 0);
         msg_set_hdr_sz(msg, SHORT_H_SIZE);
 
-        tsk->probing_state = TIPC_CONN_OK;
         sk_reset_timer(sk, &sk->sk_timer, jiffies + CONN_PROBING_INTERVAL);
+        tipc_set_sk_state(sk, TIPC_ESTABLISHED);
         tipc_node_add_conn(net, peer_node, tsk->portid, peer_port);
         tsk->max_pkt = tipc_node_get_mtu(net, peer_node, tsk->portid);
         tsk->peer_caps = tipc_node_get_capabilities(net, peer_node);
@@ -2263,7 +2267,7 @@ static void tipc_sk_timeout(unsigned long data)
         peer_port = tsk_peer_port(tsk);
         peer_node = tsk_peer_node(tsk);
 
-        if (tsk->probing_state == TIPC_CONN_PROBING) {
+        if (tsk->probe_unacked) {
                 if (!sock_owned_by_user(sk)) {
                         sk->sk_socket->state = SS_DISCONNECTING;
                         tipc_node_remove_conn(sock_net(sk), tsk_peer_node(tsk),
@@ -2281,7 +2285,7 @@ static void tipc_sk_timeout(unsigned long data)
         skb = tipc_msg_create(CONN_MANAGER, CONN_PROBE,
                               INT_H_SIZE, 0, peer_node, own_node,
                               peer_port, tsk->portid, TIPC_OK);
-        tsk->probing_state = TIPC_CONN_PROBING;
+        tsk->probe_unacked = true;
         sk_reset_timer(sk, &sk->sk_timer, jiffies + CONN_PROBING_INTERVAL);
         bh_unlock_sock(sk);
         if (skb)