From 91ae4fdcf874b61a3d7732ff199f4ee9737ce3c9 Mon Sep 17 00:00:00 2001 From: hidnplayr Date: Sat, 25 Jan 2014 13:14:23 +0000 Subject: [PATCH] More bugfixes for SOCKET_notify. git-svn-id: svn://kolibrios.org@4528 a494cfbc-eb01-0410-851d-a64ba20cac60 --- kernel/trunk/network/socket.inc | 8 ++++---- kernel/trunk/network/tcp_usreq.inc | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/kernel/trunk/network/socket.inc b/kernel/trunk/network/socket.inc index c841d26796..4170d32c7d 100644 --- a/kernel/trunk/network/socket.inc +++ b/kernel/trunk/network/socket.inc @@ -697,7 +697,7 @@ SOCKET_close: test [eax + SOCKET.state], SS_BLOCKED ; Is the socket still in blocked state? jz @f - call SOCKET_notify.unblock ; Unblock it. + call SOCKET_notify ; Unblock it. @@: cmp [eax + SOCKET.Domain], AF_INET4 @@ -1776,12 +1776,12 @@ SOCKET_notify: ret .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 .found: test [eax + SOCKET.state], SS_BLOCKED - jnz .unblock + jnz .un_block ; socket and thread exists and socket is of non blocking type. ; We'll try to flag an event to the thread. @@ -1793,7 +1793,7 @@ SOCKET_notify: ret - .unblock: + .un_block: ; socket and thread exists and socket is of blocking type ; We'll try to unblock it. and [eax + SOCKET.state], not SS_BLOCKED ; Clear the 'socket is blocked' flag diff --git a/kernel/trunk/network/tcp_usreq.inc b/kernel/trunk/network/tcp_usreq.inc index d990748b27..3c7d8ed240 100644 --- a/kernel/trunk/network/tcp_usreq.inc +++ b/kernel/trunk/network/tcp_usreq.inc @@ -186,7 +186,7 @@ TCP_connect: mov eax, [esp+4] mov [eax + SOCKET.errorcode], ETIMEDOUT and [eax + SOCKET.state], not SS_ISCONNECTING - call SOCKET_notify.unblock + call SOCKET_notify ret 4 .fail: