WebSVN – Kolibri OS – Path Comparison – /

Regard whitespace Rev 3736 → Rev 3737

 /kernel/trunk/network/socket.inc
 ,6 → 871,9
         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

 /kernel/trunk/network/tcp_subr.inc
 ,7 → 190,7
 ;;; TODO: update slow start threshold
         call    SOCKET_is_disconnected
-        call    SOCKET_free
+;;        call    SOCKET_free
         ret

/kernel/trunk/network/udp.inc
116,7 → 116,6
;
;-----------------------------------------------------------------
align 4
diff16 "UDP packetgfgfgfgfs", 0, $
UDP_input:

DEBUGF DEBUG_NETWORK_VERBOSE, "UDP_input: size=%u\n", ecx

 /programs/network/downloader/downloader.asm
 ,21 → 359,14
         DEBUGF  1, "Reading incoming data\n"
-        mcall   40, EVM_STACK + EVM_BUTTON
         mov     eax, [buf_ptr]
         mov     [pos], eax
   .read:
-        mcall   23, 100         ; 1 second timeout
-        cmp     eax, EV_BUTTON
-        je      exit
-  .read_dontwait:
-        mcall   recv, [socketnum], [pos], BUFFERSIZE, MSG_DONTWAIT
+        mcall   recv, [socketnum], [pos], BUFFERSIZE, 0
         inc     eax             ; -1 = error (socket closed?)
         jz      .no_more_data
         dec     eax             ; 0 bytes...
-        jz      .read           ; timeout
+        jz      .read
         DEBUGF  1, "Got chunk of %u bytes\n", eax
 ,9 → 378,6
         mcall   68, 20, , [buf_ptr]     ; reallocate memory block (make bigger)
         ; TODO: parse header and resize buffer only once
         pop     eax
-        cmp     eax, BUFFERSIZE
-        je      .read_dontwait
         jmp     .read
   .no_more_data: