WebSVN – Kolibri OS – Diff – /kernel/branches/Kolibri-acpi/network/socket.inc

 ;;         GNU GENERAL PUBLIC LICENSE                              ;;
 ;;          Version 2, June 1991                                   ;;
 ;;                                                                 ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-$Revision: 3725 $
+$Revision: 3908 $
 struct  SOCKET
         get_from_queue (eax + SOCKET_QUEUE_LOCATION), MAX_backlog, 4, .block
 ; Ok, we got a socket ptr
-        mov     eax, [esi]
-; Convert it to a socket number
-        call    SOCKET_ptr_to_num
-        jz      .invalid        ; FIXME ?
+        mov     eax, [esi]
 ; Change thread ID to that of the current thread
         mov     ebx, [TASK_BASE]
+        mov     ebx, [ebx + TASKDATA.pid]
+        mov     [eax + SOCKET.TID], ebx
+; Convert it to a socket number
-        mov     ebx, [ebx + TASKDATA.pid]
+        call    SOCKET_ptr_to_num
-        mov     [eax + SOCKET.TID], ebx
+        jz      .invalid        ; FIXME ?
 ; and return it to caller
         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
         test    ecx, ecx
         jz      .nd
         rep movsd
   .nd:
-        call    kernel_free                                     ; free kernel buffer
+        call    NET_packet_free
         pop     eax                                             ; return number of bytes copied to application
         xor     ebx, ebx
         ret
         pusha
         lea     ecx, [eax + SOCKET.mutex]
         call    mutex_unlock
         popa
-        call    kernel_free
+        call    NET_packet_free
         add     esp, 8
   .found_pid:
         shl     ecx, 8
         or      [ecx + SLOT_BASE + APPDATA.event_mask], EVENT_NETWORK
         DEBUGF  DEBUG_NETWORK_VERBOSE, "SOCKET_notify: Raised a network event!\n"
         DEBUGF  DEBUG_NETWORK_VERBOSE, "SOCKET_notify: poking thread %u!\n", eax
         jmp     .done
 ;----------------------------------------------------
+;
 ; SOCKET_free
+;
 ; Free socket data memory and remove socket from the list
+; Caller should lock and unlock socket_mutex
+;
 ; IN:  eax = socket ptr
 ; OUT: /
+;
 ;----------------------------------------------------
 align 4
 SOCKET_free:
-        DEBUGF  DEBUG_NETWORK_VERBOSE, "SOCKET_free: %x\n", eax
-        pusha
-        mov     ecx, socket_mutex
-        call    mutex_lock
-        popa
+        DEBUGF  DEBUG_NETWORK_VERBOSE, "SOCKET_free: %x\n", eax
         call    SOCKET_check
         pop     ebx
         DEBUGF  DEBUG_NETWORK_VERBOSE, "SOCKET_free: success!\n"
-  .error:
-        pusha
-        mov     ecx, socket_mutex
-        call    mutex_unlock
         popa
   .error:
         ret
         mov     esi, esp
         add_to_queue (ebx + SOCKET_QUEUE_LOCATION), MAX_backlog, 4, .fail2
         pop     eax
 ; Copy structure from current socket to new
+; We start at PID to preserve the socket num, 2 pointers and mutex
-; We start at PID to preserve the socket num, and the 2 pointers at beginning of socket
+; TID will be filled in later
         lea     esi, [ebx + SOCKET.PID]
         lea     edi, [eax + SOCKET.PID]
         mov     ecx, (SOCKET_QUEUE_LOCATION - SOCKET.PID + 3)/4
         rep movsd
+        and     [eax + SOCKET.options], not SO_ACCEPTCON
+; Notify owner of parent socket
+        push    eax
+        mov     eax, ebx
         call    SOCKET_notify
-        and     [eax + SOCKET.options], not SO_ACCEPTCON
+        pop     eax
         ret
+;
 ;------------------------------------------------------
 align 4
 SOCKET_process_end:
-        pushf
-        cli     ; FIXME
         DEBUGF  DEBUG_NETWORK_VERBOSE, "SOCKET_process_end: %x\n", edx
         pusha
         mov     [ebx + SOCKET.PID], 0
         mov     eax, ebx
         mov     ebx, [ebx + SOCKET.NextPtr]
-        pusha
-        mov     ecx, socket_mutex
-        call    mutex_unlock
-        popa
         pusha
         cmp     [eax + SOCKET.Domain], AF_INET4
         jne     .free
   .free:
         call    SOCKET_free
   .closed:
-        popa
-        pusha
-        mov     ecx, socket_mutex
-        call    mutex_lock
-        popa
         popa
         jmp     .next_socket_test
   .done:
         pop     ebx
         pusha
-        mov     ecx, socket_mutex
-        call    mutex_unlock
-        popa
+        mov     ecx, socket_mutex

Subversion Repositories Kolibri OS

(root)/kernel/branches/Kolibri-acpi/network/socket.inc – Rev 3725 → 3908