d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix the port of the NetBSD 19990120-accept fix. I misread a piece of

Browse Source 
code when examining their fix, which caused my code (in rev 1.52) to:
- panic("soaccept: !NOFDREF")
- fatal trap 12, with tracebacks going thru soclose and soaccept
This commit is contained in:
Bill Fenner 1999-02-02 07:23:28 +00:00
parent 04d04825cc
commit 8f70ac3e02
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sys/kern/uipc_socket.c
View File

@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)uipc_socket.c 8.3 (Berkeley) 4/15/94
* $Id: uipc_socket.c,v 1.52 1999/01/25 16:58:52 fenner Exp $
* $Id: uipc_socket.c,v 1.53 1999/01/27 21:49:57 dillon Exp $
*/
#include <sys/param.h>
@ -199,11 +199,12 @@ sofree(so)
* accept(2) may hang after select(2) indicated
* that the listening socket was ready.
*/
return;
} else {
panic("sofree: not queued");
}
head->so_qlen--;
so->so_state &= ~(SS_INCOMP|SS_COMP);
so->so_state &= ~SS_INCOMP;
so->so_head = NULL;
}
sbrelease(&so->so_snd);
@ -233,7 +234,11 @@ soclose(so)
}
for (sp = so->so_comp.tqh_first; sp != NULL; sp = sonext) {
sonext = sp->so_list.tqe_next;
/* Dequeue from so_comp since sofree() won't do it */
TAILQ_REMOVE(&so->so_comp, sp, so_list);
so->so_qlen--;
sp->so_state &= ~SS_COMP;
sp->so_head = NULL;
(void) soabort(sp);
}
}