浏览代码

tcp: fix double increment for the established stats

The counter/stats for established TCP connections were incremented
twice in the case of accept()-ed connections: once immediately
after the accept() and another time after the first packet
received or sent on the connection.
Now they are incremented only after the first successful send or
receive.
Andrei Pelinescu-Onciul 15 年之前
父节点
当前提交
66cda7bc5f
共有 1 个文件被更改,包括 9 次插入1 次删除
  1. 9 1
      tcp_main.c

+ 9 - 1
tcp_main.c

@@ -3973,7 +3973,15 @@ static inline int handle_new_connect(struct socket_info* si)
 		return 1; /* success, because the accept was succesfull */
 	}
 	(*tcp_connections_no)++;
-	TCP_STATS_ESTABLISHED(S_CONN_ACCEPT);
+	/* stats for established connections are incremented after
+	   the first received or sent packet.
+	   Alternatively they could be incremented here for accepted
+	   connections, but then the connection state must be changed to
+	  S_CONN_OK:
+	  TCP_STATS_ESTABLISHED(S_CONN_ACCEPT);
+	  ...
+	  tcpconn=tcpconn_new(new_sock, &su, dst_su, si, si->proto, S_CONN_OK);
+	*/
 	
 	dst_su=&si->su;
 	if (unlikely(si->flags & SI_IS_ANY)){