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

 ;;                                                                 ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-$Revision: 3514 $
-ENOBUFS         = 1
-EOPNOTSUPP      = 4
-EWOULDBLOCK     = 6
-ENOTCONN        = 9
-EALREADY        = 10
-EINVAL          = 11
-EMSGSIZE        = 12
-ENOMEM          = 18
-EADDRINUSE      = 20
 $Revision: 3514 $
 struct  SOCKET
         mov     [esp+32], edi                   ; return socketnumber
         DEBUGF  DEBUG_NETWORK_VERBOSE, "socknum=%u\n", edi
 ;        push    edx
 ;        and     edx, SO_NONBLOCK
-        or      [eax + SOCKET.options], SO_NONBLOCK ;edx
+        or      [eax + SOCKET.options], SO_NONBLOCK ;edx        ; HACK: make all sockets non-blocking untill API and applications are fixed
 ;        pop     edx
 ;        and     edx, not SO_NONBLOCK
         push    [TCP_sequence_num]
         add     [TCP_sequence_num], 6400
         pop     [eax + TCP_SOCKET.ISS]
         mov     [eax + TCP_SOCKET.timer_keepalive], TCP_time_keep_init
-        TCP_sendseqinit eax
         TCP_sendseqinit eax
 ;        mov     [ebx + TCP_SOCKET.timer_retransmission],   ;; todo: create macro to set retransmission timer
         mov     ebx, eax
         mov     ebx, eax
         lea     eax, [ebx + STREAM_SOCKET.snd]
         call    SOCKET_ring_create              ; TODO: check if memory was available or not
         pusha
         lea     ecx, [ebx + SOCKET.mutex]
         call    mutex_unlock
         popa
         push    ebx
         mov     eax, ebx
+        call    TCP_output
+        pop     eax
+  .block:
+        test    [eax + SOCKET.options], SO_NONBLOCK
+        jz      .loop
+        mov     dword[esp+20], EWOULDBLOCK
+        mov     dword[esp+32], 0                 ; Should be -1? or not?
+        ret
+  .loop:
+        cmp     [eax + TCP_SOCKET.t_state], TCPS_CLOSED
+        je      .fail
+        cmp     [eax + TCP_SOCKET.t_state], TCPS_SYN_SENT
+        jne     .syn_received
+        call    SOCKET_block
+        jmp     .loop
-        call    TCP_output
+  .fail:
+        mov     eax, [eax + SOCKET.errorcode]
+        mov     [esp+20], eax
+        mov     dword[esp+32], -1
         ret
 ;;; TODO: wait for successfull connection if blocking socket
+  .syn_received:
         mov     dword[esp+32], 0
-        mov     dword[esp+32], 0
+        ret
         ret
 align 4
 ; SOCKET_block
+;
 ; Suspends the thread attached to a socket
+;
 ;  IN:  eax = socket ptr
-;  OUT: /
+;  OUT: eax = unchanged
+;
 ;-----------------------------------------------------------------
 align 4
 SOCKET_block:
         DEBUGF  DEBUG_NETWORK_VERBOSE, "SOCKET_block: %x\n", eax
         pushf
-        pushf
+        push    eax
         cli
         DEBUGF  DEBUG_NETWORK_VERBOSE, "SOCKET_block: suspending thread: %u\n", edx
         mov     [eax + SOCKET.TID], edx
         pop     edx
+        call    change_task
-        call    change_task
+        pop     eax
         popf
 ; SOCKET_notify
+;
 ; notify's the owner of a socket that something happened
+;
 ;  IN:  eax = socket ptr
-;  OUT: /
+;  OUT: eax = unchanged
+;
 ;-----------------------------------------------------------------
 align 4
 SOCKET_notify:
 align 4
 SOCKET_is_connected:
         DEBUGF  DEBUG_NETWORK_VERBOSE, "SOCKET_is_connected: %x\n", eax
-        and     [eax + SOCKET.options], not (SS_ISCONNECTING + SS_ISDISCONNECTING + SS_ISCONFIRMING)
+        and     [eax + SOCKET.state], not (SS_ISCONNECTING + SS_ISDISCONNECTING + SS_ISCONFIRMING)
 align 4
 SOCKET_is_disconnecting:
         DEBUGF  DEBUG_NETWORK_VERBOSE, "SOCKET_is_disconnecting: %x\n", eax
-        and     [eax + SOCKET.options], not (SS_ISCONNECTING)
+        and     [eax + SOCKET.state], not (SS_ISCONNECTING)
 align 4
 SOCKET_is_disconnected:
         DEBUGF  DEBUG_NETWORK_VERBOSE, "SOCKET_is_disconnected: %x\n", eax
-        and     [eax + SOCKET.options], not (SS_ISCONNECTING + SS_ISCONNECTED + SS_ISDISCONNECTING)
+        and     [eax + SOCKET.state], not (SS_ISCONNECTING + SS_ISCONNECTED + SS_ISDISCONNECTING)
-        or      [eax + SOCKET.options], SS_CANTRCVMORE + SS_CANTSENDMORE
+        or      [eax + SOCKET.state], SS_CANTRCVMORE + SS_CANTSENDMORE
 align 4
 SOCKET_cant_recv_more:
         DEBUGF  DEBUG_NETWORK_VERBOSE, "SOCKET_cant_recv_more: %x\n", eax
-        or      [eax + SOCKET.options], SS_CANTRCVMORE
+        or      [eax + SOCKET.state], SS_CANTRCVMORE
 align 4
 SOCKET_cant_send_more:
         DEBUGF  DEBUG_NETWORK_VERBOSE, "SOCKET_cant_send_more: %x\n", eax
-        or      [eax + SOCKET.options], SS_CANTSENDMORE
+        or      [eax + SOCKET.state], SS_CANTSENDMORE
         mov     [eax + SOCKET.snd_proc], .notconn

Subversion Repositories Kolibri OS

(root)/kernel/trunk/network/socket.inc – Rev 3673 → 3674