Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove all the pending connections in soclose(). 

'continue' in 'do .. while (0)' doesn't do what ad@ intended.
This commit is contained in:
dsl 2008-07-25 22:45:58 +00:00
parent 9edd12efca
commit c43281ec80
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sys/kern/uipc_socket.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: uipc_socket.c,v 1.168 2008/06/18 09:06:27 yamt Exp $ */
/* $NetBSD: uipc_socket.c,v 1.169 2008/07/25 22:45:58 dsl Exp $ */
/*-
* Copyright (c) 2002, 2007, 2008 The NetBSD Foundation, Inc.
@ -63,7 +63,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.168 2008/06/18 09:06:27 yamt Exp $");
__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.169 2008/07/25 22:45:58 dsl Exp $");
#include "opt_sock_counters.h"
#include "opt_sosend_loan.h"
@ -645,23 +645,21 @@ soclose(struct socket *so)
solock(so);
if (so->so_options & SO_ACCEPTCONN) {
do {
if ((so2 = TAILQ_FIRST(&so->so_q0)) != 0) {
while ((so2 = TAILQ_FIRST(&so->so_q0)) != 0) {
KASSERT(solocked2(so, so2));
(void) soqremque(so2, 0);
/* soabort drops the lock. */
(void) soabort(so2);
solock(so);
continue;
}
if ((so2 = TAILQ_FIRST(&so->so_q)) != 0) {
while ((so2 = TAILQ_FIRST(&so->so_q)) != 0) {
KASSERT(solocked2(so, so2));
(void) soqremque(so2, 1);
/* soabort drops the lock. */
(void) soabort(so2);
solock(so);
continue;
}
} while (0);
} while (!TAILQ_EMPTY(&so->so_q0));
}
if (so->so_pcb == 0)
goto discard;