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

 ;;          GNU GENERAL PUBLIC LICENSE                             ;;
 ;;             Version 2, June 1991                                ;;
 ;;                                                                 ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-$Revision: 3270 $
+$Revision: 3275 $
 ;-----------------------------------------------------------------
+;
         ret
   .fail:
+        DEBUGF  2, "TCP incoming queue is full, discarding packet!\n"
-        DEBUGF  2, "TCP incoming queue is full, discarding packet!\n"
+        inc     [TCP_segments_missed]   ; FIXME: use correct interface
         add     esp, sizeof.TCP_queue_entry - 8
         call    kernel_free
         add     esp, 4
         mov     si, [edx + TCP_header.DestinationPort]
   .socket_loop:
         mov     ebx, [ebx + SOCKET.NextPtr]
         or      ebx, ebx
-        jz      .drop_with_reset_no_socket
+        jz      .respond_seg_reset
         cmp     [ebx + SOCKET.Domain], AF_INET4
         mov     [ebx + TCP_SOCKET.timer_keepalive], TCP_time_keep_idle
 ;--------------------
 ; Process TCP options
-        push    ecx     ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+        push    ecx
   .no_paws:
         jmp     .opt_loop
   .no_options:
-        pop     ecx;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+        pop     ecx
         mov     [ebx + TCP_SOCKET.SND_UNA], eax
 ; Stop retransmit timer
         mov     [ebx + TCP_SOCKET.timer_retransmission], 0
-; Awaken waiting processes
+; Unlock the socket
         pusha
         lea     ecx, [ebx + SOCKET.mutex]
+        call    mutex_unlock
-        call    mutex_unlock
+        popa
         popa
 ; Awaken waiting processes
         mov     eax, ebx
         or      [ebx + TCP_SOCKET.t_flags], TF_DELACK   ; Set delayed ack flag
-        jmp     .drop
         jmp     .drop
        @@:
         DEBUGF  1,"Receive window size=%d\n", eax
         mov     [ebx + TCP_SOCKET.RCV_WND], eax
         pop     edx
-; If listen or Syn sent, go to that specific code right away
+; If we are in listen or syn_sent state, go to that specific code right away
         cmp     [ebx + TCP_SOCKET.t_state], TCPS_LISTEN
         je      .LISTEN
-        cmp     [ebx + TCP_SOCKET.t_state], TCPS_SYN_SENT
         je      .SYN_SENT
         cmp     [ebx + TCP_SOCKET.t_state], TCPS_SYN_SENT
-        DEBUGF  1,"TCP_input: state is not listen or syn_sent\n"
+        je      .SYN_SENT
         jz      .not_terminated
         mov     eax, ebx
         call    TCP_close
 ;;;TODO: update stats
-        jmp     .drop_with_reset_no_socket
+        jmp     .respond_seg_reset
 ;----------------------------------------
         mov     eax, [edx + TCP_header.AckNumber]
         mov     [ebx + TCP_SOCKET.SND_NXT], eax
         mov     eax, [ebx + TCP_SOCKET.t_maxseg]
         mov     [ebx + TCP_SOCKET.SND_CWND], eax
+; Unlock the socket
-        mov     eax, ebx
+        push    ebx
+        lea     ecx, [ebx + SOCKET.mutex]
+        call    mutex_unlock
+; retransmit missing segment
+        mov     eax, [esp]
+        call    TCP_output
+; Lock the socket again
+        mov     ecx, [esp]
-        call    TCP_output                                      ; retransmit missing segment
+        add     ecx, SOCKET.mutex
+        call    mutex_lock
+        pop     ebx
-        push    edx
+; Continue processing
         xor     edx, edx
-        mov     eax, [ebx + TCP_SOCKET.t_maxseg]
-        mul     [ebx + TCP_SOCKET.t_dupacks]
+        mov     eax, [ebx + TCP_SOCKET.t_maxseg]
-        pop     edx
+        mul     [ebx + TCP_SOCKET.t_dupacks]
         add     eax, [ebx + TCP_SOCKET.SND_SSTHRESH]
         mov     [ebx + TCP_SOCKET.SND_CWND], eax
         DEBUGF  1,"TCP_input: Increasing congestion window\n"
         mov     eax, [ebx + TCP_SOCKET.t_maxseg]
+        add     [ebx + TCP_SOCKET.SND_CWND], eax
+; Unlock the socket
+        push    ebx
+        lea     ecx, [ebx + SOCKET.mutex]
+        call    mutex_unlock
-        add     [ebx + TCP_SOCKET.SND_CWND], eax
 ; retransmit missing segment
+        mov     eax, [esp]
+        call    TCP_output
+; Lock the socket again
+        mov     ecx, [esp]
+        add     ecx, SOCKET.mutex
-        mov     eax, ebx
+        call    mutex_lock
-        call    TCP_output
+        pop     ebx
 ;----------------------------------------
 ; Wake up process waiting on send buffer
   .wakeup:
-        pushf                   ; Why?
+        pushf                   ; Keep the flags (Carry flag)
         mov     eax, ebx
         popf
+; General ACK handling complete
-; General ACK handling complete
+; Now do the state-specific ones
-; Now do the state-specific ones
+; Carry flag is set when our FIN is acked
   .reset_dupacks:               ; We got a new ACK, reset duplicate ACK counter
         mov     [ebx + TCP_SOCKET.t_dupacks], 0
+        jmp     .ack_processed
-        jmp     .ack_processed
+;-------
 ; LISTEN
 align 4
 ;;;        call    SOCKET_notify_owner
-        jmp     .trim_then_step6
         jmp     .trim_then_step6
 ;------------
         mov     eax, [edx + TCP_header.SequenceNumber]
         mov     [ebx + TCP_SOCKET.RCV_UP], eax
         dec     eax
         mov     [ebx + TCP_SOCKET.SND_WL1], eax
+;-------
+; step 6
-  .ack_processed:       ; (step 6)
+  .ack_processed:
         jnz     .dumpit
         or      [eax + TCP_SOCKET.t_flags], TF_ACKNOW
-        jmp     .need_output
         jmp     .need_output
   .drop_with_reset:
         DEBUGF  1,"TCP_input: Drop with reset\n"
         jz      .dumpit
         DEBUGF  1,"TCP_input: ACK now!\n"
   .need_output:
-        DEBUGF  1,"TCP_input: need output\n"
         DEBUGF  1,"TCP_input: need output\n"
         call    TCP_output
   .dumpit:
         DEBUGF  1,"TCP_input: dumping\n"
         call    kernel_free
+        call    kernel_free
+        add     esp, 4
-        add     esp, 4
+        ret
-        ret
+;---------
 ; Respond
   .respond_ack:
-        push    ebx
-        mov     cl, TH_RST
+        push    ebx
-        call    TCP_respond
+        mov     cl, TH_RST
-        pop     ebx
+        call    TCP_respond
-        jmp     .destroy_new_socket
+        pop     ebx
         jmp     .destroy_new_socket
+  .respond_syn:
+        push    ebx
+        mov     cl, TH_RST + TH_ACK
+        call    TCP_respond
+        pop     ebx
+        jmp     .destroy_new_socket
+  .respond_seg_reset:
+        test    [edx + TCP_header.Flags], TH_RST
+        jnz     .drop_no_socket
+        ;;; TODO: if its a multicast/broadcast, also drop
+        test    [edx + TCP_header.Flags], TH_ACK
+        jnz     .respond_seg_ack
+        test    [edx + TCP_header.Flags], TH_SYN
+        jnz     .respond_seg_syn
+        jmp     .drop_no_socket
+  .respond_seg_ack:
-  .respond_syn:
+        mov     cl, TH_RST
-        push    ebx
+        call    TCP_respond_segment
-        mov     cl, TH_RST + TH_ACK
+        jmp     .drop_no_socket
-        call    TCP_respond
-        pop     ebx
-        jmp     .destroy_new_socket
+  .respond_seg_syn:
         mov     cl, TH_RST + TH_ACK
         call    TCP_respond_segment
         jmp     .drop_no_socket
 ;-----
-; Drop
 ;-----
-  .drop:
+; Drop
-        DEBUGF  1,"TCP_input: Dropping packet\n"
+  .drop:
   .drop_no_socket:
         DEBUGF  1,"TCP_input: Drop (no socket)\n"
         call    kernel_free
-        add     esp, 4
         add     esp, 4
-        ret
-  .drop_with_reset_no_socket:
-        DEBUGF  1,"TCP_input: Drop with reset (no socket)\n"
-        test    [edx + TCP_header.Flags], TH_RST
-        jnz     .drop_no_socket
-        ;;; TODO: if its a multicast/broadcast, also drop
-        test    [edx + TCP_header.Flags], TH_ACK
-        jnz     .respond_seg_ack
-        test    [edx + TCP_header.Flags], TH_SYN
-        jnz     .respond_seg_syn
-        jmp     .drop_no_socket
-  .respond_seg_ack:
-        mov     cl, TH_RST
-        call    TCP_respond_segment
-        jmp     .drop_no_socket
-  .respond_seg_syn:
-        mov     cl, TH_RST + TH_ACK
-        call    TCP_respond_segment
-        jmp     .drop_no_socket
+        ret

Subversion Repositories Kolibri OS

(root)/kernel/branches/net/network/tcp_input.inc – Rev 3270 → 3275