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

 ;;          GNU GENERAL PUBLIC LICENSE                             ;;
 ;;             Version 2, June 1991                                ;;
 ;;                                                                 ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-$Revision: 1533 $
+$Revision: 1534 $
 ; Socket states
 TCB_CLOSED		equ 0
 	DEBUGF	1,"Checksum is correct\n"
+	sub	ecx, esi	; update packet size
-	sub	ecx, esi	; update packet size
+	jl	.drop
-	jl	.drop
+	DEBUGF	1,"we got %u bytes of data\n", ecx
 ;----------------------------------------------------------------------------------------
 ; unscale the window into a 32 bit value (notice that SND_SCALE must be initialised to 0)
 	movzx	eax, [edx + TCP_segment.Window]
-	push	cx
+	push	ecx
 	mov	cl, [ebx + TCP_SOCKET.SND_SCALE]
 	shl	eax, cl
-	pop	cx
+	pop	ecx
 	mov	eax, [ebx + TCP_SOCKET.SND_NXT]
 	cmp	eax, [ebx + TCP_SOCKET.SND_MAX]
+	jne	.not_uni_xfer
-	jne	.not_uni_xfer
+	DEBUGF	1,"6\n"
 ;---------------------------------------
 ; check if we are sender in the uni-xfer
 ; If the following 4 conditions are all true, this segment is a pure ACK.
+;
+; - The segment contains no data.
+	test	ecx, ecx
-; - The segment contains no data.
+	jnz	.not_sender
 	test	ecx, ecx
-	jnz	.not_sender
+	DEBUGF	1,"7\n"
 ; - 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.
+	mov	eax, [ebx + TCP_SOCKET.SND_CWND]
-;     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.
+	cmp	eax, [ebx + TCP_SOCKET.SND_WND]
-	mov	eax, [ebx + TCP_SOCKET.SND_CWND]
+	jl	.not_uni_xfer
-	cmp	eax, [ebx + TCP_SOCKET.SND_WND]
-	jl	.not_uni_xfer
+	DEBUGF	1,"8\n"
+; - The acknowledgment field in the segment is less than or equal to the maximum sequence number sent.
 	mov	eax, [edx + TCP_segment.AckNumber]
-; - The acknowledgment field in the segment is less than or equal to the maximum sequence number sent.
+	cmp	eax, [ebx + TCP_SOCKET.SND_MAX]
-	mov	ecx, [edx + TCP_segment.AckNumber]
+	jg	.not_uni_xfer
 	cmp	ecx, [ebx + TCP_SOCKET.SND_MAX]
-	jg	.not_uni_xfer
+	DEBUGF	1,"9\n"
 ; maybe we are the receiver in the uni-xfer then..
   .not_sender:
+; - The amount of data in the segment is greater than 0 (data count is in ecx)
-; - The amount of data in the segment is greater than 0 (data count is in ecx)
+	DEBUGF	1,"10\n"
 ; - The acknowledgment field equals the largest unacknowledged sequence number. This means no data is acknowledged by this segment.
 	mov	eax, [edx + TCP_segment.AckNumber]
 	;;; update stats
   .rst_close:
-	DEBUGF	1,"Closing with reset"
+	DEBUGF	1,"Closing with reset\n"
 	;;; tcp_drop ( ECONNRESET)
 	jmp	.drop_with_reset
 	test	[edx + TCP_segment.Flags], TH_ACK
 	jz	.drop
       @@:
 ;----------------
 ; Process the ACK
 	cmp	[ebx + TCP_SOCKET.t_state], TCB_SYN_RECEIVED
 	jg	.ack_dup
 	jl	.ack_nodup
-	DEBUGF	1,"TCP state = syn received"
+	DEBUGF	1,"TCP state = syn received\n"
 	;;;;;
   .ack_dup:
-	DEBUGF	1,"Duplicate ACK"
+	DEBUGF	1,"Duplicate ACK\n"
+;------------------------------------------
-;------------------------------------------
+; Remove acknowledged data from send buffer
-; Remove acknowledged data from send buffer
+	push	ecx
 	mov	ecx, [edx + TCP_segment.AckNumber]			 ;;;
+	sub	ecx, [ebx + TCP_SOCKET.SND_UNA] 			;;;
-	xor	ecx, ecx	;;;;;;
+	lea	eax, [ebx + STREAM_SOCKET.snd]
-	lea	eax, [ebx + STREAM_SOCKET.snd]
+	call	SOCKET_ring_free	  ;;;; 943 - 956
-	call	SOCKET_ring_free	  ;;;; 943 - 956
+	pop	ecx
 ;--------------------------------
 ; process the data in the segment
   .do_data:
-	DEBUGF	1,"TCP: do data\n"
+	DEBUGF	1,"TCP: do data (%u)\n", ecx
   .no_window:
 ;--------------------------
 ; Should a segment be sent?
-	test	[ebx + TCP_SOCKET.t_flags], TF_ACKNOW
+	test	[eax + TCP_SOCKET.t_flags], TF_ACKNOW
 	jnz	.send
 	test	dl, TH_SYN + TH_RST
 	jnz	.send
-	mov	eax, [ebx + TCP_SOCKET.SND_UP]
+	mov	ebx, [eax + TCP_SOCKET.SND_UP]
-	cmp	eax, [ebx + TCP_SOCKET.SND_UNA]
+	cmp	ebx, [eax + TCP_SOCKET.SND_UNA]
 	jg	.send
 	test	dl, TH_FIN
 	jz	.enter_persist
-	test	[ebx + TCP_SOCKET.t_flags], TF_SENTFIN
+	test	[eax + TCP_SOCKET.t_flags], TF_SENTFIN

Subversion Repositories Kolibri OS

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