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

 ;;          GNU GENERAL PUBLIC LICENSE                             ;;
 ;;             Version 2, June 1991                                ;;
 ;;                                                                 ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-$Revision: 2888 $
+$Revision: 2890 $
 ;-----------------------------------------------------------------
+;
+;
 ; OUT: /
+;
 ;-----------------------------------------------------------------
 align 4
-TCP_sendalot:
-        DEBUGF 1,"TCP_sendalot\n"
-        pop     eax
-;align 4
 TCP_output:
-        DEBUGF 1,"TCP_output, socket: %x\n", eax
         DEBUGF 1,"TCP_output, socket: %x\n", eax
 ; We'll detect the length of the data to be transmitted, and flags to be used
 ; If there is some data, or any critical controls to send (SYN / RST), then transmit
         mov     ebx, [eax + TCP_SOCKET.t_maxseg]
         mov     [eax + TCP_SOCKET.SND_CWND], ebx
   .not_idle:
+  .again:
+        mov     [eax + TCP_SOCKET.sendalot], 0
   .again:
         mov     ebx, [eax + TCP_SOCKET.SND_NXT]         ; calculate offset (71)
         sub     ebx, [eax + TCP_SOCKET.SND_UNA]         ;
         jnz     .no_zero_window
         cmp     ebx, [eax + STREAM_SOCKET.snd.size]
         jae     @f
-        and     dl, not (TH_FIN)          ; clear the FIN flag    ??? how can it be set before?
+        and     dl, not (TH_FIN)
         cmp     esi, [eax + TCP_SOCKET.t_maxseg]
         jbe     @f
-        mov     esi, [eax + TCP_SOCKET.t_maxseg]
-        push    eax
+        mov     esi, [eax + TCP_SOCKET.t_maxseg]
-        push    dword TCP_sendalot
+        inc     [eax + TCP_SOCKET.sendalot]
        @@:
 ;--------------------------------------------
 ; Turn of FIN flag if send buffer not emptied (128)
         mov     edi, [eax + TCP_SOCKET.SND_NXT]
-        add     edi, esi
-        sub     edi, [eax + TCP_SOCKET.SND_UNA]
+        add     edi, esi
-        sub     edi, [eax + STREAM_SOCKET.snd.size]
+        sub     edi, [eax + TCP_SOCKET.SND_UNA]
-        jns     @f
+        cmp     edi, [eax + STREAM_SOCKET.snd.size]
         jz      .len_zero
         cmp     esi, [eax + TCP_SOCKET.t_maxseg]
+        je      TCP_send
+        add     ebx, esi                                ; offset + length
+        cmp     ebx, [eax + STREAM_SOCKET.snd.size]
-        je      TCP_send
+        jb      @f
+        test    [eax + TCP_SOCKET.t_flags], TF_NODELAY
+        jnz     TCP_send
-        test    [eax + TCP_SOCKET.t_flags], TF_NODELAY
+        mov     ebx, [eax + TCP_SOCKET.SND_MAX]
-        jnz     @f
+        cmp     ebx, [eax + TCP_SOCKET.SND_UNA]
-        ; TODO: if not 'idle', skip to next codeblock
-       @@:
-        add     ebx, esi
-        cmp     ebx, [eax + STREAM_SOCKET.snd.size]
+        je      TCP_send
-        jae     TCP_send
+       @@:
         jz      .enter_persist  ; no reason to send, enter persist state
 ; FIN was set, only send if not already sent, or on retransmit
         test    [eax + TCP_SOCKET.t_flags], TF_SENTFIN
-        jnz     TCP_send
+        jz      TCP_send
 align 4
 TCP_send:
+        DEBUGF  1,"TCP_send socket=%x length=%u flags=%x\n", eax, esi, dl
         DEBUGF  1,"TCP_send socket=%x length=%u flags=%x\n", eax, esi, dl
-        mov     edi, sizeof.TCP_header  ; edi will contain headersize
-        sub     esp, 8                  ; create some space on stack
+        push    eax                     ; save socket ptr
-        push    eax                     ; save socket pointer
+        mov     edi, sizeof.TCP_header  ; edi will contain headersize
 ;------------------------------------
         add     esi, edi                        ; total TCP segment size
         cmp     esi, [eax + TCP_SOCKET.t_maxseg]
         jbe     .no_overflow
-        mov     esi, [eax + TCP_SOCKET.t_maxseg]
-;;        push    eax
+        mov     esi, [eax + TCP_SOCKET.t_maxseg]
-;;        push    dword TCP_sendalot
         inc     [eax + TCP_SOCKET.sendalot]
   .no_overflow:
 ;-----------------------------------------------------------------
 ;-----------------------------------------
 ; Move TCP header from stack to TCP packet
         push    ecx
-        mov     ecx, [esp+4]
+        mov     ecx, [esp + 4]
-        lea     esi, [esp+4+4]
+        lea     esi, [esp + 8]
-        shr     ecx, 2
+        shr     ecx, 2                  ; count is in bytes, we will work with dwords
         rep     movsd
-        pop     ecx             ; full TCP packet size
+        pop     ecx                     ; full TCP packet size
-        pop     esi             ; headersize
+        pop     esi                     ; headersize
-        add     esp, esi
+        add     esp, esi                ; remove it from stack
-        mov     [esp + 4], eax          ; packet ptr
+        push    edx                     ; packet size for send proc
-        mov     [esp + 4+4], edx        ; packet size
+        push    eax                     ; packet ptr for send proc
 ; eax = ptr to ring struct
 ; ecx = buffer size
 ; edi = ptr to buffer
-        mov     eax, [esp + 4]                  ; get socket ptr
+        mov     eax, [esp + 12]                 ; get socket ptr
         add     [eax + TCP_SOCKET.SND_NXT], ecx ; update sequence number
         push    edx
         test    ecx, ecx
         jz      .nodata
         add     eax, STREAM_SOCKET.snd
         call    SOCKET_ring_read
   .nodata:
+        pop     esi                             ; begin of data
-        pop     esi                             ; begin of data
+        pop     ecx                             ; full packet size
-        pop     ecx                             ; full packet size
+        mov     eax, [esp + 8]
         pop     eax                             ; socket ptr
         mov     edx, [eax + TCP_SOCKET.t_rxtcur]
         mov     [eax + TCP_SOCKET.timer_retransmission], dx
         cmp     [eax + TCP_SOCKET.timer_persist], 0
-        jne     @f
+        jne     .retransmit_set
-        mov     [eax + TCP_SOCKET.timer_persist], 0
-        mov     [eax + TCP_SOCKET.t_rxtshift], 0
+        mov     [eax + TCP_SOCKET.timer_persist], 0
-       @@:
+        mov     [eax + TCP_SOCKET.t_rxtshift], 0
         DEBUGF  1,"checksum: ptr=%x size=%u\n", esi, ecx
         TCP_checksum (eax + IP_SOCKET.LocalIP), (eax + IP_SOCKET.RemoteIP)
-        mov     [esi + TCP_header.Checksum], dx
-; unlock socket
-        pusha
-        lea     ecx, [eax + SOCKET.mutex]
-        call    mutex_unlock
-        popa
+        mov     [esi + TCP_header.Checksum], dx
 ;----------------
 ; Send the packet
+        DEBUGF  1,"Sending TCP Packet to device %x\n", ebx
+        call    [ebx + NET_DEVICE.transmit]
+        jnz     .send_error
+        pop     eax
+        inc     [TCP_segments_tx]       ; FIXME: correct interface?
+;;; TODO: (485)
+        push    [eax + TCP_SOCKET.RCV_NXT]
+        pop     [eax + TCP_SOCKET.last_ack_sent]
+        and     [eax + TCP_SOCKET.t_flags], not (TF_ACKNOW + TF_DELACK)
+        cmp     [eax + TCP_SOCKET.sendalot], 0
+        jne     TCP_output.again
+; unlock socket
+        lea     ecx, [eax + SOCKET.mutex]
+        call    mutex_unlock
         DEBUGF 1,"TCP_output: success!\n"
         DEBUGF  1,"Sending TCP Packet to device %x\n", ebx
-        call    [ebx + NET_DEVICE.transmit]
+        xor     eax, eax
         ret
   .ip_error:
-        pop     ecx
+  .ip_error:
-        add     esp, ecx
+        pop     ecx
-        pop     eax
+        add     esp, ecx
-        add     esp, 8
-        mov     [eax + TCP_SOCKET.timer_retransmission], TCP_time_re_min
+        pop     eax
+        mov     [eax + TCP_SOCKET.timer_retransmission], TCP_time_re_min
+; unlock socket
+        lea     ecx, [eax + SOCKET.mutex]
+        call    mutex_unlock
+        DEBUGF 1,"TCP_output: IP error\n"
+        or      eax, -1
+        ret
+  .send_error:
+        pop     eax
+; unlock socket

Subversion Repositories Kolibri OS

(root)/kernel/branches/net/network/tcp_output.inc – Rev 2888 → 2890