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

 ;;         GNU GENERAL PUBLIC LICENSE                              ;;
 ;;          Version 2, June 1991                                   ;;
 ;;                                                                 ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-$Revision: 3261 $
+$Revision: 3264 $
 struct  SOCKET
         NextPtr                 dd ? ; pointer to next socket in list
+        PrevPtr                 dd ? ; pointer to previous socket in list
-        PrevPtr                 dd ? ; pointer to previous socket in list
+        Number                  dd ? ; socket number
         Number                  dd ? ; socket number
         mutex                   MUTEX
         mutex                   MUTEX
         PID                     dd ? ; process ID
         get_from_queue (eax + SOCKET_QUEUE_LOCATION), MAX_backlog, 4, .block
 ; Ok, we got a socket ptr
         mov     eax, [esi]
-; Change PID to that of the current process
+; Change thread ID to that of the current thread
         mov     ebx, [TASK_BASE]
         mov     ebx, [ebx + TASKDATA.pid]
-        mov     [eax + SOCKET.PID], ebx
+        mov     [eax + SOCKET.TID], ebx
 ; Convert it to a socket number
         DEBUGF  2,"SOCKET_close: socknum=%u\n", ecx
         call    SOCKET_num_to_ptr
-        jz      s_error
-        cmp     [eax + SOCKET.Domain], AF_INET4
-        jne     s_error
+        jz      s_error
-        cmp     [eax + SOCKET.Protocol], IP_PROTO_UDP
-        je      .free
-        cmp     [eax + SOCKET.Protocol], IP_PROTO_ICMP
+        mov     dword [esp+32], 0                               ; The socket exists, so we will succeed in closing it.
-        je      .free
   .socket:
-        cmp     [eax + SOCKET.Protocol], IP_PROTO_IP
+        cmp     [eax + SOCKET.Domain], AF_INET4
+        jne     .free
-        je      .free
+        cmp     [eax + SOCKET.Protocol], IP_PROTO_TCP
         je      .tcp
         cmp     [eax + SOCKET.Protocol], IP_PROTO_TCP
-        je      .tcp
+  .free:
         call    SOCKET_free
-        jmp     s_error
+        ret
-  .tcp:
-        cmp     [eax + TCP_SOCKET.t_state], TCPS_SYN_RECEIVED    ; state must be LISTEN, SYN_SENT or CLOSED
-        jb      .free
-        call    TCP_usrclosed
-        call    TCP_output      ;;;; Fixme: is this nescessary??
-;;; TODO: wait for successfull termination if blocking socket
         mov     dword [esp+32], 0
   .tcp:
-        ret
+        cmp     [eax + TCP_SOCKET.t_state], TCPS_SYN_RECEIVED    ; state must be LISTEN, SYN_SENT or CLOSED
         ; Change PID to that of current process
         mov     ebx, [TASK_BASE]
         mov     ebx, [ebx + TASKDATA.pid]
+        mov     [eax + SOCKET.PID], ebx
-        mov     [eax + SOCKET.PID], ebx
+        mov     [eax + SOCKET.TID], ebx         ; currently TID = PID in kolibrios :(
       @@:
         ; Change PID to that of current process
         mov     ebx, [TASK_BASE]
         mov     ebx, [ebx + TASKDATA.pid]
+        mov     [eax + SOCKET.PID], ebx
-        mov     [eax + SOCKET.PID], ebx
+        mov     [eax + SOCKET.TID], ebx         ; currently TID = PID in kolibrios :(
       @@:
         mov     [eax + SOCKET.snd_proc], SOCKET_send_local_
         or      [eax + SOCKET.state], SS_BLOCKED
         ; Suspend the thread
         push    edx
-        mov     edx, [TASK_BASE]
-        DEBUGF  1,"SOCKET_block: suspending PID: %u\n", [edx + TASKDATA.pid]
+        mov     edx, [TASK_BASE]
+        mov     [edx + TASKDATA.state], 1               ; Suspended
+        ; Remember the thread ID so we can wake it up again
+        mov     edx, [edx + TASKDATA.pid]
+        DEBUGF  1,"SOCKET_block: suspending thread: %u\n", edx
-        mov     [edx + TASKDATA.state], 1               ; Suspended
+        mov     [eax + SOCKET.TID], edx
         pop     edx
         push    eax ecx esi
 ; socket exists and is of non blocking type.
 ; We'll try to flag an event to the thread
-        mov     eax, [eax + SOCKET.PID]
+        mov     eax, [eax + SOCKET.TID]
         test    eax, eax
         jz      .done
         push    eax ecx esi
         ; Clear the 'socket is blocked' flag
         and     [eax + SOCKET.state], not SS_BLOCKED
         ; Find the thread's TASK_DATA
-        mov     eax, [eax + SOCKET.PID]
+        mov     eax, [eax + SOCKET.TID]
         test    eax, eax
         jz      .error
         xor     ecx, ecx
         inc     ecx
 ; Fill in PID
         mov     ebx, [TASK_BASE]
         mov     ebx, [ebx + TASKDATA.pid]
+        mov     [eax + SOCKET.PID], ebx
-        mov     [eax + SOCKET.PID], ebx
+        mov     [eax + SOCKET.TID], ebx         ; currently TID = PID in kolibrios :(
 ; init mutex
         pusha
         push    ebx
         mov     ebx, net_sockets
   .next_socket:
-        mov     ebx, [ebx + SOCKET.NextPtr]
-  .test_socket:
+        mov     ebx, [ebx + SOCKET.NextPtr]
         test    ebx, ebx
         jz      .done
         cmp     [ebx + SOCKET.PID], edx
         jne     .next_socket
-        DEBUGF  1,"SOCKET_process_end: killing socket %x\n", ebx
-        mov     [ebx + SOCKET.PID], 0
-        cmp     [ebx + SOCKET.Protocol], IP_PROTO_TCP
         je      .tcp
-; The socket is stateless, just kill it right away!
-        mov     eax, ebx
-        mov     ebx, [ebx + SOCKET.NextPtr]
-        call    SOCKET_free
-        jmp     .test_socket
+        DEBUGF  1, "SOCKET_process_end: killing socket %x\n", ebx
-  .tcp:
+        mov     [ebx + SOCKET.PID], 0
-        push    [ebx + SOCKET.NextPtr]
+        mov     eax, ebx
-        mov     eax, ebx
+        pusha
-        call    TCP_disconnect
+        call    SOCKET_close.socket
-        pop     ebx
+        popa

Subversion Repositories Kolibri OS

(root)/kernel/branches/net/network/socket.inc – Rev 3261 → 3264