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

 ;;         GNU GENERAL PUBLIC LICENSE                              ;;
 ;;          Version 2, June 1991                                   ;;
 ;;                                                                 ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-$Revision: 5842 $
+$Revision: 5969 $
 struct  SOCKET
 SOCKET_bind:
         DEBUGF  DEBUG_NETWORK_VERBOSE, "SOCKET_bind: socknum=%u sockaddr=%x length=%u\n", ecx, edx, esi
         call    SOCKET_num_to_ptr
-        call    SOCKET_num_to_ptr
+        test    eax, eax
         jz      .invalid
 SOCKET_connect:
         DEBUGF  DEBUG_NETWORK_VERBOSE, "SOCKET_connect: socknum=%u sockaddr=%x length=%u\n", ecx, edx, esi
         call    SOCKET_num_to_ptr
-        call    SOCKET_num_to_ptr
+        test    eax, eax
         jz      .invalid
 SOCKET_listen:
         DEBUGF  DEBUG_NETWORK_VERBOSE, "SOCKET_listen: socknum=%u backlog=%u\n", ecx, edx
         call    SOCKET_num_to_ptr
-        call    SOCKET_num_to_ptr
+        test    eax, eax
         jz      .invalid
 SOCKET_accept:
         DEBUGF  DEBUG_NETWORK_VERBOSE, "SOCKET_accept: socknum=%u sockaddr=%x length=%u\n", ecx, edx, esi
         call    SOCKET_num_to_ptr
-        call    SOCKET_num_to_ptr
+        test    eax, eax
         jz      .invalid
         get_from_queue (eax + SOCKET_QUEUE_LOCATION), MAX_backlog, 4, .block
 ; Ok, we got a socket ptr
+        mov     eax, [esi]
+; Verify that it is (still) a valid socket
+        call    SOCKET_check
-        mov     eax, [esi]
+        jz      .invalid
-; Change thread ID to that of the current thread
+; Change sockets thread owner ID to that of the current thread
         mov     ebx, [TASK_BASE]
         mov     ebx, [ebx + TASKDATA.pid]
-        mov     [eax + SOCKET.TID], ebx
+        mov     [eax + SOCKET.TID], ebx
-; Convert it to a socket number
-        call    SOCKET_ptr_to_num
         jz      .invalid        ; FIXME ?
 ; Return socket number to caller
-; and return it to caller
+        mov     eax, [eax + SOCKET.Number]
         mov     [esp+32], eax
 SOCKET_close:
         DEBUGF  DEBUG_NETWORK_VERBOSE, "SOCKET_close: socknum=%u\n", ecx
         call    SOCKET_num_to_ptr
-        call    SOCKET_num_to_ptr
+        test    eax, eax
         jz      .invalid
 SOCKET_receive:
         DEBUGF  DEBUG_NETWORK_VERBOSE, "SOCKET_receive: socknum=%u bufaddr=%x buflength=%u flags=%x\n", ecx, edx, esi, edi
         call    SOCKET_num_to_ptr
-        call    SOCKET_num_to_ptr
+        test    eax, eax
         jz      .invalid
 SOCKET_send:
         DEBUGF  DEBUG_NETWORK_VERBOSE, "SOCKET_send: socknum=%u data ptr=%x length=%u flags=%x\n", ecx, edx, esi, edi
         call    SOCKET_num_to_ptr
-        call    SOCKET_num_to_ptr
+        test    eax, eax
         jz      .invalid
 SOCKET_get_opt:
         DEBUGF  DEBUG_NETWORK_VERBOSE, "SOCKET_get_opt\n"
         call    SOCKET_num_to_ptr
-        call    SOCKET_num_to_ptr
+        test    eax, eax
         jz      .invalid
 SOCKET_set_opt:
         DEBUGF  DEBUG_NETWORK_VERBOSE, "SOCKET_set_opt\n"
         call    SOCKET_num_to_ptr
-        call    SOCKET_num_to_ptr
+        test    eax, eax
         jz      .invalid
         mov     [ebx + SOCKET.device], eax
         lea     eax, [eax + STREAM_SOCKET.rcv]
         call    SOCKET_ring_create
         test    eax, eax
-        jz      .nomem1
+        jz      .nomem2
         lea     eax, [ebx + STREAM_SOCKET.rcv]
         call    SOCKET_ring_create
         test    eax, eax
         jz      .nomem2
         ret
   .nomem2:
+        mov     eax, [esp+20]
+        call    SOCKET_free
-  .nomem2:
+  .nomem1:
-        mov     eax, ebx
+        mov     eax, [esp+32]
         call    SOCKET_free
   .nomem1:
         test    ecx, ecx
         jz      .returnall
         call    SOCKET_num_to_ptr
-        call    SOCKET_num_to_ptr
+        test    eax, eax
         jz      .invalid
         mov     dword[esp+32], eax
         ret
   .invalid:
         mov     dword[esp+32], -1
-        mov     dword[esp+28], EINVAL
+        mov     dword[esp+20], EINVAL
         ret
         stdcall create_ring_buffer, SOCKET_MAXDATA, PG_SWR
         pop     edx
         test    eax, eax
         jz      .fail
-        DEBUGF  DEBUG_NETWORK_VERBOSE, "SOCKET_ring_created: %x\n", eax
+        DEBUGF  DEBUG_NETWORK_VERBOSE, "SOCKET_ring_create: %x\n", eax
         pusha
         lea     ecx, [esi + RING_BUFFER.mutex]
         mov     [esi + RING_BUFFER.size], 0
         add     eax, SOCKET_MAXDATA
         mov     [esi + RING_BUFFER.end_ptr], eax
         mov     eax, esi
+        pop     esi
+        ret
+  .fail:
-  .fail:
+        DEBUGF  DEBUG_NETWORK_ERROR, "SOCKET_ring_create: Out of memory!\n"
         pop     esi
         ret
+;
 ; SOCKET_alloc
+;
 ; Allocate memory for socket data and put new socket into the list
 ; Newly created socket is initialized with calling PID and number and
-; put into beginning of list (which is a fastest way).
+; put into beginning of list (which is the fastest way).
+;
 ; IN:  /
 ; OUT: eax = 0 on error, socket ptr otherwise
 ;      edi = socket number
+;
 SOCKET_alloc:
         push    ebx
         stdcall kernel_alloc, SOCKETBUFFSIZE
-        DEBUGF  DEBUG_NETWORK_VERBOSE, "SOCKET_alloc: ptr=%x\n", eax
+        stdcall kernel_alloc, SOCKETBUFFSIZE
+        or      eax, eax
-        or      eax, eax
+        jz      .nomem
-        jz      .exit
+        DEBUGF  DEBUG_NETWORK_VERBOSE, "SOCKET_alloc: ptr=%x\n", eax
 ; zero-initialize allocated memory
         pusha
         mov     ecx, socket_mutex
         call    mutex_unlock
-        popa
-  .exit:
+        popa
         pop     ebx
+        ret
+  .nomem:
+        DEBUGF  DEBUG_NETWORK_ERROR, "SOCKET_alloc: Out of memory!\n"
         pop     ebx
         ret
   .not_yet:
         pusha
         lea     ecx, [eax + SOCKET.mutex]
         call    mutex_lock
         popa
-        cmp     [eax + SOCKET.Domain], AF_INET4
-        jnz     .no_tcp
-        cmp     [eax + SOCKET.Protocol], IP_PROTO_TCP
+        cmp     [eax + SOCKET.Type], SOCK_STREAM
-        jnz     .no_tcp
+        jne     .no_stream
+        mov     ebx, eax
+        cmp     [eax + STREAM_SOCKET.rcv.start_ptr], 0
+        je      @f
+        stdcall free_kernel_space, [eax + STREAM_SOCKET.rcv.start_ptr]
+  @@:
-        mov     ebx, eax
+        cmp     [ebx + STREAM_SOCKET.snd.start_ptr], 0
+        je      @f
-        stdcall kernel_free, [ebx + STREAM_SOCKET.rcv.start_ptr]
+        stdcall free_kernel_space, [ebx + STREAM_SOCKET.snd.start_ptr]
-        stdcall kernel_free, [ebx + STREAM_SOCKET.snd.start_ptr]
+  @@:
         mov     eax, ebx
-  .no_tcp:
+  .no_stream:
         DEBUGF  DEBUG_NETWORK_VERBOSE, "SOCKET_free: freeing socket %x\n", eax
         DEBUGF  DEBUG_NETWORK_VERBOSE, "SOCKET_free: success!\n"
   .error:
+        ret
+  .error1:
+        pop     ebx
+        DEBUGF  DEBUG_NETWORK_ERROR, "Error in socket free!\n"
+        DEBUGF  DEBUG_NETWORK_ERROR, "socket ptr=0x%x caller=0x%x\n", eax, [esp]
         ret
 ;------------------------------------
+;
 ; SOCKET_fork
+;
 ; Get socket structure address by its number
+;
 ; IN:  ecx = socket number
 ; OUT: eax = 0 on error, socket ptr otherwise
-;       ZF = set on error
+;
 ;---------------------------------------------------
 align 4
 SOCKET_num_to_ptr:
         mov     ecx, socket_mutex
         call    mutex_lock
         popa
-        mov     eax, net_sockets
         mov     eax, net_sockets
   .next_socket:
         mov     eax, [eax + SOCKET.NextPtr]
-        or      eax, eax
+        test    eax, eax
         jz      .error
         cmp     [eax + SOCKET.Number], ecx
-        jne     .next_socket
-        test    eax, eax
+        jne     .next_socket
         pusha
         mov     ecx, socket_mutex
 align 4
 SOCKET_check:
+        DEBUGF  DEBUG_NETWORK_VERBOSE, "SOCKET_check: %x\n", eax
-        DEBUGF  DEBUG_NETWORK_VERBOSE, "SOCKET_check: %x\n", eax
+        test    eax, eax
         jz      .error
         push    ebx
         mov     ebx, net_sockets
   .done:
         mov     eax, ebx
         test    eax, eax
+        pop     ebx
+        ret
+  .error:
-        pop     ebx
+        DEBUGF  DEBUG_NETWORK_ERROR, "Socket_check called with argument 0\n"
         DEBUGF  DEBUG_NETWORK_ERROR, "stack: 0x%x, 0x%x, 0x%x\n", [esp], [esp+4], [esp+8]

Subversion Repositories Kolibri OS

(root)/kernel/trunk/network/socket.inc – Rev 5842 → 5969