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

accept(2) on a socket that has been shutdown(2) normally returns

Browse Source 
ECONNABORTED. Make this happen in the non-blocking case as well.
The previous behavior was to return EAGAIN, which (a) is not
consistent with the blocking case and (b) causes the application
to think the socket is still valid.

PR:		bin/42100
Reviewed by:	freebsd-net
MFC after:	3 days
This commit is contained in:
Archie Cobbs 2002-08-28 20:56:01 +00:00
parent b20ea17938
commit f2f03122c3
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sys/kern/uipc_syscalls.c
View File

@ -268,16 +268,15 @@ accept1(td, uap, compat)
error = EINVAL;
goto done;
}
if ((head->so_state & SS_NBIO) && TAILQ_EMPTY(&head->so_comp)) {
splx(s);
error = EWOULDBLOCK;
goto done;
}
while (TAILQ_EMPTY(&head->so_comp) && head->so_error == 0) {
if (head->so_state & SS_CANTRCVMORE) {
head->so_error = ECONNABORTED;
break;
}
if ((head->so_state & SS_NBIO) != 0) {
head->so_error = EWOULDBLOCK;
break;
}
error = tsleep(&head->so_timeo, PSOCK | PCATCH,
"accept", 0);
if (error) {