[OSKITTCP]

- Signal readable when read is closed and writeable when write is closed
- This seems counterintuitive on the surface but signaling the socket in this way ensures that pending reads and writes are cancelled if either side shuts down send/receive
- Graceful close (recv() returns 0 bytes and FD_CLOSE is signaled when we receive a FIN) works much better

svn path=/trunk/; revision=52504
This commit is contained in:
Cameron Gutman 2011-07-02 21:47:30 +00:00
parent 0669007af7
commit c7d3d99eaf

View file

@ -31,13 +31,13 @@ void wakeup( struct socket *so, void *token ) {
OS_DbgPrint(OSK_MID_TRACE,("Socket accepting q\n"));
flags |= SEL_ACCEPT;
}
if( so->so_rcv.sb_cc > 0 && !(so->so_state & SS_CANTRCVMORE) &&
(so->so_state & SS_ISCONNECTED) ) {
if( (so->so_rcv.sb_cc > 0 && (so->so_state & SS_ISCONNECTED)) ||
(so->so_state & SS_CANTRCVMORE)) {
OS_DbgPrint(OSK_MID_TRACE,("Socket readable\n"));
flags |= SEL_READ;
}
if( 0 < sbspace(&so->so_snd) && !(so->so_state & SS_CANTSENDMORE) &&
(so->so_state & SS_ISCONNECTED) ) {
if( (0 < sbspace(&so->so_snd) && (so->so_state & SS_ISCONNECTED)) ||
(so->so_state & SS_CANTSENDMORE)) {
OS_DbgPrint(OSK_MID_TRACE,("Socket writeable\n"));
flags |= SEL_WRITE;
}