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

 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;                                                                 ;;
-;; Copyright (C) KolibriOS team 2004-2013. All rights reserved.    ;;
+;; Copyright (C) KolibriOS team 2004-2014. All rights reserved.    ;;
 ;; Distributed under terms of the GNU General Public License       ;;
 ;;                                                                 ;;
 ;;  Part of the TCP/IP network stack for KolibriOS                 ;;
 ;;                                                                 ;;
 ;;   Written by hidnplayr@kolibrios.org                            ;;
 ;;                                                                 ;;
-;;    Based on the code of 4.4BSD                                  ;;
+;;    Based on the algorithms used in 4.4BSD                       ;;
 ;;                                                                 ;;
 ;;          GNU GENERAL PUBLIC LICENSE                             ;;
 ;;             Version 2, June 1991                                ;;
 ;;                                                                 ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-$Revision: 5000 $
+$Revision: 5133 $
 ;-----------------------------------------------------------------
+;
 ; - The acknowledgment field equals the largest unacknowledged sequence number. This means no data is acknowledged by this segment.
         mov     eax, [edx + TCP_header.AckNumber]
         cmp     eax, [ebx + TCP_SOCKET.SND_UNA]
         jne     .not_uni_xfer
-; - The reassembly list of out-of-order segments for the connection is empty (seg_next equals tp).
+; - The reassembly list of out-of-order segments for the connection is empty.
-;;; TODO
+        cmp     [ebx + TCP_SOCKET.seg_next], 0
-;       jnz     .not_uni_xfer
+        jne     .not_uni_xfer
         push    word [ebx + TCP_SOCKET.requested_s_scale]       ; Set send and receive scale factors to the received values
         pop     word [ebx + TCP_SOCKET.SND_SCALE]
        @@:
-;;; TODO: call TCP_reassemble
+        call    TCP_reassemble
         sub     [ebx + TCP_SOCKET.SND_WND], ecx
         call    SOCKET_ring_free
         pop     ebx edx ecx
         DEBUGF  DEBUG_NETWORK_VERBOSE, "TCP_input: our FIN is acked\n"
-        stc
         or      [temp_bits], TCP_BIT_FIN_IS_ACKED
         jmp     .wakeup
         pop     ebx
         sub     [ebx + TCP_SOCKET.SND_WND], ecx
         pop     edx ecx
-        DEBUGF  DEBUG_NETWORK_VERBOSE, "TCP_input: our FIN is not acked\n"
-        clc
+        DEBUGF  DEBUG_NETWORK_VERBOSE, "TCP_input: our FIN is not acked\n"
 ;----------------------------------------
-; Wake up process waiting on send buffer
-  .wakeup:
+; Wake up process waiting on send buffer
-        pushf                   ; Keep the flags (Carry flag)
+  .wakeup:
-        mov     eax, ebx
-        call    SOCKET_notify
+        mov     eax, ebx
         call    SOCKET_notify
 ; Update TCPS
 ; Update TCPS
         mov     eax, [edx + TCP_header.AckNumber]
         mov     [ebx + TCP_SOCKET.SND_UNA], eax
-        cmp     eax, [ebx + TCP_SOCKET.SND_NXT]
-        jb      @f
-        mov     [ebx + TCP_SOCKET.SND_NXT], eax
+        cmp     eax, [ebx + TCP_SOCKET.SND_NXT]
-       @@:
+        jb      @f
         mov     [ebx + TCP_SOCKET.SND_NXT], eax
-        popf
+       @@:
         dd      .ack_processed  ; TCPS_FIN_WAIT_2
         dd      .ack_tw         ; TCPS_TIMED_WAIT
+  .ack_fw1:
-  .ack_fw1:
+        test    [temp_bits], TCP_BIT_FIN_IS_ACKED
-        jnc     .ack_processed
+        jz      .ack_processed
         test    [ebx + SOCKET.state], SS_CANTRCVMORE
        @@:
         mov     [ebx + TCP_SOCKET.t_state], TCPS_FIN_WAIT_2
         jmp     .ack_processed
+  .ack_c:
-  .ack_c:
+        test    [temp_bits], TCP_BIT_FIN_IS_ACKED
-        jnc     .ack_processed
+        jz      .ack_processed
         mov     [ebx + TCP_SOCKET.t_state], TCPS_TIMED_WAIT
         mov     eax, ebx
         mov     eax, ebx
         call    SOCKET_is_disconnected
         jmp     .ack_processed
+  .ack_la:
-  .ack_la:
+        test    [temp_bits], TCP_BIT_FIN_IS_ACKED
-        jnc     .ack_processed
+        jz      .ack_processed
         push    ebx
         lea     ecx, [ebx + SOCKET.mutex]
         pusha
         mov     eax, ebx
         call    SOCKET_notify
         popa
-        jmp     .trim_then_step6
+        jmp     .trim
 ;------------
 ;;; TODO: reassemble packets queue
         mov     eax, [ebx + TCP_SOCKET.t_rtt]
         test    eax, eax
-        je      .trim_then_step6
+        je      .trim
         call    TCP_xmit_timer
-        jmp     .trim_then_step6
+        jmp     .trim
   .simultaneous_open:
         DEBUGF  DEBUG_NETWORK_VERBOSE, "TCP_input: simultaneous open\n"
 ; We have received a syn but no ACK, so we are having a simultaneous open..
-        mov     [ebx + TCP_SOCKET.t_state], TCPS_SYN_RECEIVED
         mov     [ebx + TCP_SOCKET.t_state], TCPS_SYN_RECEIVED
 ;-------------------------------------
-; Common processing for receipt of SYN
+;-------------------------------------
 ; Common processing for receipt of SYN
         mov     ecx, [ebx + TCP_SOCKET.RCV_WND]
         and     [edx + TCP_header.Flags], not (TH_FIN)
 ;;; TODO: update stats
-  .dont_trim:
   .dont_trim:
         mov     eax, [edx + TCP_header.SequenceNumber]
         mov     [ebx + TCP_SOCKET.RCV_UP], eax
         dec     eax
-        mov     [ebx + TCP_SOCKET.SND_WL1], eax
-;-------
-; step 6
+        mov     [ebx + TCP_SOCKET.SND_WL1], eax
   .ack_processed:
   .ack_processed:
         DEBUGF  DEBUG_NETWORK_VERBOSE, "TCP_input: ACK processed\n"
         test    [temp_bits], TCP_BIT_NEEDOUTPUT
         jnz     .need_output
         test    [eax + TCP_SOCKET.t_flags], TF_ACKNOW
-        jz      .dumpit
+        jz      .done
         DEBUGF  DEBUG_NETWORK_VERBOSE, "TCP_input: ACK now!\n"
   .need_output:
         DEBUGF  DEBUG_NETWORK_VERBOSE, "TCP_input: need output\n"
         call    TCP_output
         lea     ecx, [ebx + SOCKET.mutex]
         call    mutex_unlock
         pop     eax edx
         test    [edx + TCP_header.Flags], TH_RST
-        jnz     .dumpit
+        jnz     .done
         or      [eax + TCP_SOCKET.t_flags], TF_ACKNOW
         lea     ecx, [ebx + SOCKET.mutex]
         call    mutex_unlock
         pop     edx ebx
         test    [edx + TCP_header.Flags], TH_RST
-        jnz     .dumpit
+        jnz     .done
         ;;; if its a multicast/broadcast, also drop
         test    [edx + TCP_header.Flags], TH_ACK
         jnz     .respond_ack
         test    [edx + TCP_header.Flags], TH_SYN
         jnz     .respond_syn
         mov     cl, TH_RST + TH_ACK
         call    TCP_respond
         pop     ebx
         jmp     .destroy_new_socket
+;-----------------------------------------
+; The connection has no associated socket
   .no_socket:
   .no_socket:
         pusha
         mov     ecx, socket_mutex
   .respond_seg_syn:
         mov     cl, TH_RST + TH_ACK
         call    TCP_respond_segment
         jmp     .drop_no_socket
-;-----
+;------------------------------------------------
-; Drop
+; Unlock socket mutex and prepare to drop segment
   .drop:
         DEBUGF  DEBUG_NETWORK_VERBOSE, "TCP_input: Dropping segment\n"
         pusha
+        lea     ecx, [ebx + SOCKET.mutex]
+        call    mutex_unlock
+        popa
         lea     ecx, [ebx + SOCKET.mutex]
-        call    mutex_unlock
+;--------------------------------------------
-        popa
+; Destroy the newly created socket if needed
   .destroy_new_socket:
+        test    [temp_bits], TCP_BIT_DROPSOCKET
+        jz      .drop_no_socket
-        test    [temp_bits], TCP_BIT_DROPSOCKET
+        mov     eax, ebx
-        jz      .drop_no_socket
+        call    SOCKET_free
-        mov     eax, ebx
+;------------------

Subversion Repositories Kolibri OS

(root)/kernel/trunk/network/tcp_input.inc – Rev 5000 → 5133