From c6d3f29329dc80f0dba3525c78e429e788ebe61b Mon Sep 17 00:00:00 2001
From: hidnplayr <hidnplayr@kolibrios.org>
Date: Tue, 12 Nov 2013 20:05:57 +0000
Subject: [PATCH] SOCKET_receive: bugfixes, return 0 when remote end closed
 connection.

git-svn-id: svn://kolibrios.org@4219 a494cfbc-eb01-0410-851d-a64ba20cac60
---
 kernel/trunk/network/socket.inc | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/kernel/trunk/network/socket.inc b/kernel/trunk/network/socket.inc
index 1336e6d85d..13f83c502c 100644
--- a/kernel/trunk/network/socket.inc
+++ b/kernel/trunk/network/socket.inc
@@ -755,15 +755,15 @@ SOCKET_receive:
         call    [eax + SOCKET.rcv_proc]
         pop     edi
 
+        test    [eax + SOCKET.state], SS_CANTRCVMORE
+        jnz     .return
+
         cmp     ebx, EWOULDBLOCK
         jne     .return
 
         test    edi, MSG_DONTWAIT
         jnz     .return_err
 
-        test    [eax + SOCKET.state], SS_CANTRCVMORE
-        jnz     .return_err
-
 ;        test    [eax + SOCKET.options], SO_NONBLOCK
 ;        jnz     .return_err
 
@@ -775,10 +775,10 @@ SOCKET_receive:
         push    EINVAL
         pop     ebx
   .return_err:
-        mov     eax, -1
+        mov     ecx, -1
   .return:
         mov     [esp+20], ebx
-        mov     [esp+32], eax
+        mov     [esp+32], ecx
         ret
 
 
@@ -799,7 +799,7 @@ SOCKET_receive_dgram:
         cmp     ecx, ebx                                        ; If data segment does not fit in applications buffer, abort
         ja      .too_small
 
-        push    ecx
+        push    eax ecx
         push    [esi + socket_queue_entry.buf_ptr]              ; save the buffer addr so we can clear it later
         mov     esi, [esi + socket_queue_entry.data_ptr]
         DEBUGF  DEBUG_NETWORK_VERBOSE, "SOCKET_receive: Source buffer=%x real addr=%x\n", [esp], esi
@@ -820,12 +820,12 @@ SOCKET_receive_dgram:
   .nd:
 
         call    NET_packet_free
-        pop     eax                                             ; return number of bytes copied to application
+        pop     ecx eax                                         ; return number of bytes copied to application
         xor     ebx, ebx
         ret
 
   .too_small:
-        mov     eax, -1
+        mov     ecx, -1
         push    EMSGSIZE
         pop     ebx
         ret
@@ -870,21 +870,23 @@ SOCKET_receive_stream:
         mov     edi, edx
         xor     edx, edx
 
+        push    eax
         add     eax, STREAM_SOCKET.rcv
         call    SOCKET_ring_read                                ; copy data from kernel buffer to application buffer
         call    SOCKET_ring_free                                ; free read memory
+        pop     eax
 
-        mov     eax, ecx                                        ; return number of bytes copied
         xor     ebx, ebx                                        ; errorcode = 0 (no error)
         ret
 
   .wouldblock:
         push    EWOULDBLOCK
         pop     ebx
+        xor     ecx, ecx
         ret
 
   .peek:
-        mov     eax, [eax + STREAM_SOCKET.rcv + RING_BUFFER.size]
+        mov     ecx, [eax + STREAM_SOCKET.rcv + RING_BUFFER.size]
         xor     ebx, ebx
         ret
 
@@ -2083,6 +2085,7 @@ SOCKET_num_to_ptr:
         mov     eax, [eax + SOCKET.NextPtr]
         or      eax, eax
         jz      .error
+                diff16 "tetten", 0, $
         cmp     [eax + SOCKET.Number], ecx
         jne     .next_socket