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

 ;;          GNU GENERAL PUBLIC LICENSE                             ;;
 ;;             Version 2, June 1991                                ;;
 ;;                                                                 ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-$Revision: 1534 $
+$Revision: 1536 $
 ; Socket states
 TCB_CLOSED		equ 0
 	.Checksum		dw ?
 	.UrgentPointer		dw ?
 	.Data:				; ..or options
 ends
-struct	tcp_in_queue_entry
-	.data_ptr	dd ?
-	.data_size	dd ?
-	.offset 	dd ?
-	.size:
-ends
-struct	tcp_out_queue_entry
-	.data_ptr	dd ?
-	.data_size	dd ?
-	.size:
-ends
 align 4
 uglobal
 	TCP_segments_tx 	rd IP_MAX_INTERFACES
 	TCP_segments_rx 	rd IP_MAX_INTERFACES
 ;      If the packets are in order (data queue is empty), add the data to the socket buffer and request a delayed ACK
 	cmp	[ebx + TCP_SOCKET.t_state], TCB_ESTABLISHED
-	jnz	.not_uni_xfer
-	DEBUGF	1,"1\n"
+	jnz	.not_uni_xfer
-	test	[edx + TCP_segment.Flags], TH_SYN + TH_FIN + TH_RST + TH_URG
-	jnz	.not_uni_xfer
 	test	[edx + TCP_segment.Flags], TH_SYN + TH_FIN + TH_RST + TH_URG
-	DEBUGF	1,"2\n"
+	jnz	.not_uni_xfer
-	test	[edx + TCP_segment.Flags], TH_ACK
 	jz	.not_uni_xfer
 	test	[edx + TCP_segment.Flags], TH_ACK
-	DEBUGF	1,"3\n"
+	jz	.not_uni_xfer
-	mov	eax, [edx + TCP_segment.SequenceNumber]
-	cmp	eax, [ebx + TCP_SOCKET.RCV_NXT]
-	jne	.not_uni_xfer
+	mov	eax, [edx + TCP_segment.SequenceNumber]
+	cmp	eax, [ebx + TCP_SOCKET.RCV_NXT]
-	DEBUGF	1,"4\n"
-;;        movzx   eax, [edx + TCP_segment.Window] ;;;;; (should use pre-calculated value isntead: todo: figure out where to store it)
+	jne	.not_uni_xfer
 ;;        cmp     eax, [ebx + TCP_SOCKET.SND_WND]
-;;        jne     .not_uni_xfer
+	movzx	eax, [edx + TCP_segment.Window] ;;;;; (should use pre-calculated value instead: todo: figure out where to store it)
-	DEBUGF	1,"5\n"
 	cmp	eax, [ebx + TCP_SOCKET.SND_WND]
-	mov	eax, [ebx + TCP_SOCKET.SND_NXT]
+	jne	.not_uni_xfer
 	cmp	eax, [ebx + TCP_SOCKET.SND_MAX]
-	jne	.not_uni_xfer
+	mov	eax, [ebx + TCP_SOCKET.SND_NXT]
 	cmp	eax, [ebx + TCP_SOCKET.SND_MAX]
-	DEBUGF	1,"6\n"
+	jne	.not_uni_xfer
-;---------------------------------------
-; check if we are sender in the uni-xfer
 ;---------------------------------------
-; If the following 4 conditions are all true, this segment is a pure ACK.
+; check if we are sender in the uni-xfer
-; - The segment contains no data.
+; If the following 4 conditions are all true, this segment is a pure ACK.
 	test	ecx, ecx
-	jnz	.not_sender
-	DEBUGF	1,"7\n"
+; - The segment contains no data.
 	test	ecx, ecx
-; - The congestion window is greater than or equal to the current send window.
+	jnz	.not_sender
 ;     This test is true only if the window is fully open, that is, the connection is not in the middle of slow start or congestion avoidance.
-	mov	eax, [ebx + TCP_SOCKET.SND_CWND]
-	cmp	eax, [ebx + TCP_SOCKET.SND_WND]
-	jl	.not_uni_xfer
+; - The congestion window is greater than or equal to the current send window.
 ;     This test is true only if the window is fully open, that is, the connection is not in the middle of slow start or congestion avoidance.
-	DEBUGF	1,"8\n"
+	mov	eax, [ebx + TCP_SOCKET.SND_CWND]
 	cmp	eax, [ebx + TCP_SOCKET.SND_WND]
 ; Packet is a pure ACK, process it
 ; Update RTT estimators
-; Delete acknowledged bytes from send buffer
-; notice how ecx already holds number of bytes ack-ed
+; Delete acknowledged bytes from send buffer
 	mov	ecx, eax
+	lea	eax, [ebx + STREAM_SOCKET.snd]
+	call	SOCKET_ring_free
+; update window pointers
+	mov	eax, [edx + TCP_segment.AckNumber]
-	lea	eax, [ebx + STREAM_SOCKET.snd]
+	dec	eax
-	call	SOCKET_ring_free
+	mov	[ebx + TCP_SOCKET.SND_WL1], eax
 ; Stop retransmit timer
 	mov	[ebx + TCP_SOCKET.timer_ack], 0
+; Awaken waiting processes
-; Awaken waiting processes
+	mov	eax, ebx
-	mov	eax, ebx
+	call	SOCKET_notify_owner
-	call	SOCKET_notify_owner
+;; Generate more output
 ;;        mov     eax, ebx
-; Generate more output
+;;        call    TCP_output
-	call	TCP_output
+;;
 ;;        jmp     .drop
-	jmp	.drop
-;-------------------------------------------------
+	jmp	.step6
 ; maybe we are the receiver in the uni-xfer then..
 ;-------------------------------------------------
-  .not_sender:
+; maybe we are the receiver in the uni-xfer then..
 	DEBUGF	1,"TCP state = syn received\n"
 	;;;;;
-  .ack_dup:
-	DEBUGF	1,"Duplicate ACK\n"
+  .ack_nodup:
-	;;;;
+	DEBUGF	1,"New ACK\n"
 ;------------------------------------------
+; Remove acknowledged data from send buffer
-; Remove acknowledged data from send buffer
+	pusha
-	push	ecx
+; Delete acknowledged bytes from send buffer
-	mov	ecx, [edx + TCP_segment.AckNumber]			 ;;;
+	mov	ecx, [edx + TCP_segment.AckNumber]
-	sub	ecx, [ebx + TCP_SOCKET.SND_UNA] 			;;;
+	sub	ecx, [ebx + TCP_SOCKET.SND_UNA]
+	lea	eax, [ebx + STREAM_SOCKET.snd]
+	call	SOCKET_ring_free
+	popa
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;  code missing (943?)
+	mov	eax, [edx + TCP_segment.AckNumber]
+	mov	[ebx + TCP_SOCKET.SND_UNA], eax
+	cmp	eax, [ebx + TCP_SOCKET.SND_NXT]
+	jl	@f
+	mov	[ebx + TCP_SOCKET.SND_NXT], eax
-	lea	eax, [ebx + STREAM_SOCKET.snd]
+       @@:
 	call	SOCKET_ring_free	  ;;;; 943 - 956
-	pop	ecx
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-._1010:
+  ._1010:
-	jmp	.step6
 	jmp	.step6
-align 4
-.step6:
+  .step6:
 	DEBUGF	1,"step 6\n"
-;--------------------------
+;----------------------------------------------
-; update window information
-	test	[edx + TCP_segment.Flags], TH_ACK
-	jz	.no_window_update
-	mov	eax, [ebx + TCP_SOCKET.SND_WL1]
-	cmp	eax, [edx + TCP_segment.SequenceNumber]
+; check if we need to update window information
-	;;;; 1021
+	test	[edx + TCP_segment.Flags], TH_ACK
 	jz	.no_window_update
+	mov	eax, [ebx + TCP_SOCKET.SND_WL1]
-;----------------------------------
+	cmp	eax, [edx + TCP_segment.SequenceNumber]
+	jl	.update_window
+	jg	@f
+	mov	eax, [ebx + TCP_SOCKET.SND_WL2]
-; Keep track of pure window updates
+	cmp	eax, [edx + TCP_segment.AckNumber]
 	jl	.update_window
-	test	ecx, ecx
+	jg	.no_window_update
-	jz	@f
+       @@:
+	mov	eax, [ebx + TCP_SOCKET.SND_WL2] 	  ;;;;
+	cmp	eax, [edx + TCP_segment.AckNumber]
+	jne	.no_window_update
+	movzx	eax, [edx + TCP_segment.Window]
+	cmp	eax, [ebx + TCP_SOCKET.SND_WND]
+	jle	.no_window_update
+  .update_window:
-	mov	eax, [ebx + TCP_SOCKET.SND_WL2]
+	DEBUGF	1,"Updating window\n"
+;----------------------------------
+; Keep track of pure window updates
+;        test    ecx, ecx
+;        jz      @f
+;
+;        mov     eax, [ebx + TCP_SOCKET.SND_WL2]
-	cmp	eax, [edx + TCP_segment.AckNumber]
+;        cmp     eax, [edx + TCP_segment.AckNumber]
-	jne	@f
+;        jne     @f
+;
-	;; mov eax, tiwin
+;        ;; mov eax, tiwin
-	cmp	eax, [ebx + TCP_SOCKET.SND_WND]
+;        cmp     eax, [ebx + TCP_SOCKET.SND_WND]
-	jle	@f
+;        jle     @f
+;
-	;;; update stats
+;        ;;; update stats
+;
-       @@:
+;       @@:
 ;-----------------------------------------------------------------
+;
 ; TCP_output
+;
 ; IN:  eax = socket pointer
-;;     esi = ptr to data
-;;     ecx = number of data bytes
+;
 ; OUT: /
+;
 ;-----------------------------------------------------------------
 align 4
 ; eax = ptr to ring struct
 ; ecx = buffer size
+; edi = ptr to buffer
 ; edi = ptr to buffer
+;        test    ecx, ecx
 	mov	eax, [esp+4]		  ; socket ptr
+	add	[eax + TCP_SOCKET.SND_NXT], ecx
-	push	edx
+	add	eax, STREAM_SOCKET.snd
+	push	edx
-	add	eax, STREAM_SOCKET.snd
+	call	SOCKET_ring_read
-	call	SOCKET_ring_read
+	pop	esi
-	pop	esi ecx
+	pop	ecx
 	pop	eax
 	test	[esi + TCP_segment.Flags], TH_SYN + TH_FIN
 	jz	@f
-	inc	[eax + TCP_SOCKET.SND_NXT]
-	;;; TODO: update sentfin flag
-       @@:
+	inc	[eax + TCP_SOCKET.SND_NXT]
 	;;; TODO: update sentfin flag
-;;        add     [eax + TCP_SOCKET.SND_NXT], ecx
+       @@:
   .fail:
 	pop	ecx
 	add	esp, ecx
-	add	esp, 4+4+8+4
+	add	esp, 4+8

Subversion Repositories Kolibri OS

(root)/kernel/branches/net/network/tcp.inc – Rev 1534 → 1536