WebSVN – Kolibri OS – Diff – /kernel/trunk/network/socket.inc

         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
   .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
         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

Subversion Repositories Kolibri OS

(root)/kernel/trunk/network/socket.inc – Rev 3737 → 3817