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

 ;;          GNU GENERAL PUBLIC LICENSE                             ;;
 ;;             Version 2, June 1991                                ;;
 ;;                                                                 ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-$Revision: 3389 $
+$Revision: 3406 $
 ;-----------------------------------------------------------------
+;
+        ret
         ret
 align 4
 TCP_process_input:
         xor     esi, esi
         mov     ecx, MANUAL_DESTROY
+        call    create_event
-        call    create_event
+        mov     [TCP_input_event], eax
-        mov     [TCP_input_event], eax
-  .loop:
+  .wait:
         mov     eax, [TCP_input_event]
         call    wait_event
-        get_from_queue TCP_queue, TCP_QUEUE_SIZE, sizeof.TCP_queue_entry, .loop
+  .loop:
-        push    .loop
-        push    [esi + TCP_queue_entry.buffer_size]
-        push    [esi + TCP_queue_entry.buffer_ptr]
-        mov     ebx, [esi + TCP_queue_entry.device_ptr]
-        mov     ecx, [esi + TCP_queue_entry.segment_size]
-        mov     edi, [esi + TCP_queue_entry.ip_ptr]
-        mov     esi, [esi + TCP_queue_entry.segment_ptr]                ; change esi last
-;-----------------------------------------------------------------
-;
-;  IN:  [esp] = ptr to buffer
-;       [esp+4] = timestamp when segment was received
+        get_from_queue TCP_queue, TCP_QUEUE_SIZE, sizeof.TCP_queue_entry, .wait
+        push    [esi + TCP_queue_entry.timestamp]
+        push    [esi + TCP_queue_entry.buffer_ptr]
+        mov     ebx, [esi + TCP_queue_entry.device_ptr]
-;       ebx = ptr to device struct
+        mov     ecx, [esi + TCP_queue_entry.segment_size]
-;       ecx = segment size
+        mov     edi, [esi + TCP_queue_entry.ip_ptr]                     ; ptr to ipv4 source address, followed by ipv4 destination address
-;       esi = ptr to TCP segment
+        mov     esi, [esi + TCP_queue_entry.segment_ptr]                ; change esi last
 ;       edi = ptr to ipv4 source address, followed by ipv4 dest address
         cmp     [ebx + TCP_SOCKET.LocalPort], si
         jne     .socket_loop
         mov     eax, [ebx + IP_SOCKET.RemoteIP]
-        cmp     eax, [edi]                              ; Ipv4 source addres
+        cmp     eax, [edi]                              ; Ipv4 source address
         je      @f
         test    eax, eax
         je      .SYN_SENT
 ;----------------------------
 ; trim any data not in window
-; check for duplicate data at beginning of segment
+; check for duplicate data at beginning of segment (635)
         and     [edx + TCP_header.Flags], not (TH_URG)
   .dup_syn:
         dec     eax
   .no_dup_syn:
-; Check for entire duplicate segment
+; Check for entire duplicate segment (646)
         cmp     eax, ecx                ; eax holds number of bytes to drop, ecx is data size
         jb      .duplicate
         jnz     @f
         test    [edx + TCP_header.Flags], TH_FIN
 ; At this point the FIN must be out of sequence or a duplicate, drop it
         and     [edx + TCP_header.Flags], not TH_FIN
 ; send an ACK and resynchronize and drop any data.
+; But keep on processing for RST or ACK
-; But keep on processing for RST or ACK
+        DEBUGF  1, "616\n"
         or      [ebx + TCP_SOCKET.t_flags], TF_ACKNOW
         mov     eax, ecx
 ;TODO: update stats
         and     [edx + TCP_header.Flags], not (TH_URG)
         mov     [edx + TCP_header.UrgentPointer], 0
        @@:
 ;--------------------------------------------------
-; Handle data that arrives after process terminates
+; Handle data that arrives after process terminates (687)
   .no_duplicate:
         cmp     [ebx + SOCKET.PID], 0
         jne     .drop_after_ack
         mov     eax, [edx + TCP_header.SequenceNumber]
         cmp     eax, [ebx + TCP_SOCKET.RCV_NXT]
         jne     .drop_after_ack
         DEBUGF  1, "690\n"
         or      [ebx + TCP_SOCKET.t_flags], TF_ACKNOW
 ;;; TODO: update stats
         jmp     .no_excess_data
   .dont_drop_all:
         sub     ecx, eax
         and     [ebx + TCP_SOCKET.t_flags], not (TH_PUSH or TH_FIN)
-  .no_excess_data:
-;--------------------- FIXME -------------------
-        pusha
-        movzx   esi, [edx + TCP_header.DataOffset]
-        add     esi, edx
-        lea     eax, [ebx + STREAM_SOCKET.rcv]
-        call    SOCKET_ring_write                       ; Add the data to the socket buffer
-        add     [ebx + TCP_SOCKET.RCV_NXT], ecx         ; Update sequence number with number of bytes we have copied
-        popa
-;--------------------- FIXME --------------------
+  .no_excess_data:
 ;-----------------
 ; Record timestamp (737-746)
         test    ecx, ecx
         jnz     .final_processing
+       @@:
+; The segment is in order?
+        mov     eax, [edx + TCP_header.SequenceNumber]
+        cmp     eax, [ebx + TCP_SOCKET.RCV_NXT]
+        jne     .out_of_order
+; The reassembly queue is empty?
+        cmp     [ebx + TCP_SOCKET.seg_next], 0
+        jne     .out_of_order
+; The connection is established?
+        cmp     [ebx + TCP_SOCKET.t_state], TCPS_ESTABLISHED
+        jne     .out_of_order
+; Ok, lets do this..  Set delayed ACK flag and copy data into socket buffer
+        or      [ebx + TCP_SOCKET.t_flags], TF_DELACK
+        pusha
+        movzx   esi, [edx + TCP_header.DataOffset]
+        add     esi, edx
+        lea     eax, [ebx + STREAM_SOCKET.rcv]
+        call    SOCKET_ring_write                       ; Add the data to the socket buffer
+        add     [ebx + TCP_SOCKET.RCV_NXT], ecx         ; Update sequence number with number of bytes we have copied
+        popa
+; Wake up the sleeping process
+        mov     eax, ebx
+        call    SOCKET_notify
+        jmp     .data_done
+  .out_of_order:
-       @@:
+; Uh-oh, some data is out of order, lets call TCP reassemble for help
+        call    TCP_reassemble
+        DEBUGF  1, "1470\n"
+        or      [ebx + TCP_SOCKET.t_flags], TF_ACKNOW
-;        call    TCP_reassemble        ;;; TODO
+  .data_done:
   .dumpit:
         DEBUGF  1,"TCP_input: dumping\n"
         call    kernel_free
         add     esp, 4
-        ret
+        jmp     .loop
 ;---------
   .drop_no_socket:
         DEBUGF  1,"TCP_input: Drop (no socket)\n"
         call    kernel_free
         add     esp, 4

Subversion Repositories Kolibri OS

(root)/kernel/branches/net/network/tcp_input.inc – Rev 3389 → 3406