KolibriOS/kolibrios
12
4
Fork 11
Code Issues 78 Pull Requests 5 Projects Releases Activity

More bugfixes for SOCKET_notify.

Browse Source 
git-svn-id: svn://kolibrios.org@4528 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
hidnplayr 2014-01-25 13:14:23 +00:00
parent 6e6f7a23d3
commit 91ae4fdcf8
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
kernel/trunk/network/socket.inc
View File

@ -697,7 +697,7 @@ SOCKET_close:
test [eax + SOCKET.state], SS_BLOCKED ; Is the socket still in blocked state? test [eax + SOCKET.state], SS_BLOCKED ; Is the socket still in blocked state?
jz @f jz @f
call SOCKET_notify.unblock ; Unblock it. call SOCKET_notify ; Unblock it.
@@: @@:
cmp [eax + SOCKET.Domain], AF_INET4 cmp [eax + SOCKET.Domain], AF_INET4
@ -1776,12 +1776,12 @@ SOCKET_notify:
ret ret
.error: .error:
DEBUGF DEBUG_NETWORK_VERBOSE, "SOCKET_notify: invalid socket ptr: 0x%x !\n", eax DEBUGF DEBUG_NETWORK_ERROR, "SOCKET_notify: invalid socket ptr: 0x%x !\n", eax
ret ret
.found: .found:
test [eax + SOCKET.state], SS_BLOCKED test [eax + SOCKET.state], SS_BLOCKED
jnz .unblock jnz .un_block
; socket and thread exists and socket is of non blocking type. ; socket and thread exists and socket is of non blocking type.
; We'll try to flag an event to the thread. ; We'll try to flag an event to the thread.
@ -1793,7 +1793,7 @@ SOCKET_notify:
ret ret
.unblock: .un_block:
; socket and thread exists and socket is of blocking type ; socket and thread exists and socket is of blocking type
; We'll try to unblock it. ; We'll try to unblock it.
and [eax + SOCKET.state], not SS_BLOCKED ; Clear the 'socket is blocked' flag and [eax + SOCKET.state], not SS_BLOCKED ; Clear the 'socket is blocked' flag

2
kernel/trunk/network/tcp_usreq.inc
View File

@ -186,7 +186,7 @@ TCP_connect:
mov eax, [esp+4] mov eax, [esp+4]
mov [eax + SOCKET.errorcode], ETIMEDOUT mov [eax + SOCKET.errorcode], ETIMEDOUT
and [eax + SOCKET.state], not SS_ISCONNECTING and [eax + SOCKET.state], not SS_ISCONNECTING
call SOCKET_notify.unblock call SOCKET_notify
ret 4 ret 4
.fail: .fail: