Skip to content

Commit a46d0ea

Browse files
JasonXingdavem330
authored andcommitted
tcp: count CLOSE-WAIT sockets for TCP_MIB_CURRESTAB
According to RFC 1213, we should also take CLOSE-WAIT sockets into consideration: "tcpCurrEstab OBJECT-TYPE ... The number of TCP connections for which the current state is either ESTABLISHED or CLOSE- WAIT." After this, CurrEstab counter will display the total number of ESTABLISHED and CLOSE-WAIT sockets. The logic of counting When we increment the counter? a) if we change the state to ESTABLISHED. b) if we change the state from SYN-RECEIVED to CLOSE-WAIT. When we decrement the counter? a) if the socket leaves ESTABLISHED and will never go into CLOSE-WAIT, say, on the client side, changing from ESTABLISHED to FIN-WAIT-1. b) if the socket leaves CLOSE-WAIT, say, on the server side, changing from CLOSE-WAIT to LAST-ACK. Please note: there are two chances that old state of socket can be changed to CLOSE-WAIT in tcp_fin(). One is SYN-RECV, the other is ESTABLISHED. So we have to take care of the former case. Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2") Signed-off-by: Jason Xing <kernelxing@tencent.com> Reviewed-by: Eric Dumazet <edumazet@google.com> Signed-off-by: David S. Miller <davem@davemloft.net>
1 parent 712115a commit a46d0ea

1 file changed

Lines changed: 5 additions & 1 deletion

File tree

net/ipv4/tcp.c

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2649,6 +2649,10 @@ void tcp_set_state(struct sock *sk, int state)
26492649
if (oldstate != TCP_ESTABLISHED)
26502650
TCP_INC_STATS(sock_net(sk), TCP_MIB_CURRESTAB);
26512651
break;
2652+
case TCP_CLOSE_WAIT:
2653+
if (oldstate == TCP_SYN_RECV)
2654+
TCP_INC_STATS(sock_net(sk), TCP_MIB_CURRESTAB);
2655+
break;
26522656

26532657
case TCP_CLOSE:
26542658
if (oldstate == TCP_CLOSE_WAIT || oldstate == TCP_ESTABLISHED)
@@ -2660,7 +2664,7 @@ void tcp_set_state(struct sock *sk, int state)
26602664
inet_put_port(sk);
26612665
fallthrough;
26622666
default:
2663-
if (oldstate == TCP_ESTABLISHED)
2667+
if (oldstate == TCP_ESTABLISHED || oldstate == TCP_CLOSE_WAIT)
26642668
TCP_DEC_STATS(sock_net(sk), TCP_MIB_CURRESTAB);
26652669
}
26662670

0 commit comments

Comments
 (0)