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

 ;;          GNU GENERAL PUBLIC LICENSE                             ;;
 ;;             Version 2, June 1991                                ;;
 ;;                                                                 ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-$Revision: 1716 $
+$Revision: 1719 $
 ; Socket states
 TCB_CLOSED		equ 0
 	jz	.not_uni_xfer
 	mov	eax, [edx + TCP_segment.SequenceNumber]
 	cmp	eax, [ebx + TCP_SOCKET.RCV_NXT]
-	jne	.not_uni_xfer
+	jne	.not_uni_xfer
+	DEBUGF	1,"TCP_segment.window=%u\n", [edx + TCP_segment.Window]:4
 	DEBUGF	1,"TCP_SOCKET.SND_WND=%u\n", [ebx + TCP_SOCKET.SND_WND]:4
 	mov	eax, dword [edx + TCP_segment.Window]
 	cmp	eax, [ebx + TCP_SOCKET.SND_WND]
 	jne	.not_uni_xfer
 ; Packet is a pure ACK, process it
 ; Update RTT estimators
 ; Delete acknowledged bytes from send buffer
-; Delete acknowledged bytes from send buffer
+	pusha
 	mov	ecx, eax
+	lea	eax, [ebx + STREAM_SOCKET.snd]
-	lea	eax, [ebx + STREAM_SOCKET.snd]
+	call	SOCKET_ring_free
-	call	SOCKET_ring_free
+	popa
 ; update window pointers
 ; Awaken waiting processes
 	mov	eax, ebx
 	call	SOCKET_notify_owner
-;; Generate more output
+;; Generate more output                  FIXME
 ;;        mov     eax, ebx
 ;;        call    TCP_output
 ;;
 ;;        jmp     .drop
-	jmp	.step6
+	jmp	.ack_processed
 ; - The acknowledgment field equals the largest unacknowledged sequence number. This means no data is acknowledged by this segment.
 	mov	eax, [edx + TCP_segment.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 (seg_next equals tp). ;;;;;;;
+;;;;;;;     TODO
 	jnz	.not_uni_xfer
+;-------------------------------------
-;-------------------------------------
+; Complete processing of received data
 ; Complete processing of received data
 	DEBUGF	1,"header prediction: we are receiver\nreceiving %u bytes of data\n", ecx
 	DEBUGF	1,"header prediction: we are receiver\nreceiving %u bytes of data\n", ecx
 	pusha
+	add	esi, edx
-	add	esi, edx
+	lea	eax, [ebx + STREAM_SOCKET.rcv]
-	lea	eax, [ebx + STREAM_SOCKET.rcv]
+	call	SOCKET_ring_write			; Add the data to the socket buffer
 	call	SOCKET_ring_write			; Add the data to the socket buffer
 	jz	@f
 	mov	eax, [edx + TCP_segment.AckNumber]
 	cmp	eax, [ebx + TCP_SOCKET.ISS]
-	jle	.drop_with_reset
-;        mov     eax, [edx + TCP_segment.AckNumber]
+	jle	.drop_with_reset
 	cmp	eax, [ebx + TCP_SOCKET.SND_MAX]
 	jg	.drop_with_reset
        @@:
 	test	[edx + TCP_segment.Flags], TH_RST
 	jz	@f
 	test	[edx + TCP_segment.Flags], TH_ACK
-	test	[edx + TCP_segment.Flags], TH_ACK
+	jz	.drop
 	jz	.drop
 	mov	eax, ebx
 	; TODO: 592
 	mov	cx, [ebx + TCP_SOCKET.RCV_WND]
 	; TODO...
        @@:
 	;;;;;
-	jmp	.step6
+	jmp	.ack_processed
 	DEBUGF	1,"Trimming window\n"
-	mov	eax, [ebx + TCP_SOCKET.RCV_NXT]
-	sub	eax, [edx + TCP_segment.SequenceNumber]
 	mov	eax, [ebx + TCP_SOCKET.RCV_NXT]
-	test	eax, eax
+	sub	eax, [edx + TCP_segment.SequenceNumber]
 	jz	.no_duplicate
 ; handle SYN-full and ACK-less segments
 	test	[edx + TCP_segment.Flags], TH_SYN
+	jz	@f
 	jz	@f
 	mov	eax, ebx
 	mov	ebx, ECONNRESET
 	call	TCP_drop
 	jmp	.drop_with_reset
+	test	[edx + TCP_segment.Flags], TH_ACK
-	test	[edx + TCP_segment.Flags], TH_ACK
+	jz	.drop
-	jz	.drop
+      @@:
-      @@:
-;----------------
-; Process the ACK
+;---------------
+; ACK processing
-	cmp	[ebx + TCP_SOCKET.t_state], TCB_SYN_RECEIVED
-	jg	.ack_dup
+	cmp	[ebx + TCP_SOCKET.t_state], TCB_SYN_RECEIVED
+	jnz	.no_syn_rcv
+	DEBUGF	1,"TCP state = syn received\n"
+	;;;;;  801-815
+  .no_syn_rcv:
+; check for duplicate ACK
+	mov	eax, [edx + TCP_segment.AckNumber]
+	cmp	eax, [ebx + TCP_SOCKET.SND_UNA]
+	jg	.not_dup_ack
+	DEBUGF	1,"Duplicate ACK\n"
+	test	ecx, ecx
+	jnz	.ack_processed
-	jl	.ack_nodup
+	mov	eax, dword [edx + TCP_segment.Window]
+	cmp	eax, [ebx + TCP_SOCKET.SND_WND]
-	DEBUGF	1,"TCP state = syn received\n"
+	jne	.ack_processed
-	;;;;;
+; Process the duplicate ACK
-  .ack_nodup:
+	;;;;; 833 - 878
 ;------------------------------------------
 ; Remove acknowledged data from send buffer
 	pusha
-; Delete acknowledged bytes from send buffer
+	pusha
+	mov	ecx, [edx + TCP_segment.AckNumber]
-	mov	ecx, [edx + TCP_segment.AckNumber]
+	sub	ecx, [ebx + TCP_SOCKET.SND_UNA] 	; ecx now holds number of bytes acked
 	sub	ecx, [ebx + TCP_SOCKET.SND_UNA]
 	lea	eax, [ebx + STREAM_SOCKET.snd]
+	call	SOCKET_ring_free
+	popa
-	call	SOCKET_ring_free
+;---------------------------------------
-	popa
+; Wake up process waiting on send buffer
 	mov	eax, ebx
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;  code missing (943?)
+	call	SOCKET_notify_owner
 ; Update TCB
-	mov	eax, [edx + TCP_segment.AckNumber]
-	mov	[ebx + TCP_SOCKET.SND_UNA], eax
+	mov	eax, [edx + TCP_segment.AckNumber]
-	cmp	eax, [ebx + TCP_SOCKET.SND_NXT]
-	jl	@f
-	mov	[ebx + TCP_SOCKET.SND_NXT], eax
+	mov	[ebx + TCP_SOCKET.SND_UNA], eax
        @@:
+	cmp	eax, [ebx + TCP_SOCKET.SND_NXT]
-;---------------------------------------
+	jl	@f
-; Wake up process waiting on send buffer
+	mov	[ebx + TCP_SOCKET.SND_NXT], eax
+       @@:
-	mov	eax, ebx
-	call	SOCKET_notify_owner
+; General ACK handling complete
+; Now do the state-specific ones
-	mov	eax, [ebx + TCP_SOCKET.t_state]
-	shl	eax, 2
+	mov	eax, [ebx + TCP_SOCKET.t_state]
-	jmp	dword [eax + .ACK_sw_list]
+	jmp	dword [eax*4 + .ACK_sw_list]
   .ACK_sw_list:
-	dd	.step6		;TCB_CLOSED
+	dd	.ack_processed	;TCB_CLOSED
+	dd	.ack_processed	;TCB_LISTEN
+	dd	.ack_processed	;TCB_SYN_SENT
+	dd	.ack_processed	;TCB_SYN_RECEIVED
+	dd	.ack_processed	;TCB_ESTABLISHED
-	dd	.step6		;TCB_LISTEN
+	dd	.ack_processed	;TCB_CLOSE_WAIT
+	dd	.ack_fw1	;TCB_FIN_WAIT_1
-	dd	.step6		;TCB_SYN_SENT
+	dd	.ack_c		;TCB_CLOSING
+	dd	.ack_la 	;TCB_LAST_ACK
-	dd	.step6		;TCB_SYN_RECEIVED
+	dd	.ack_processed	;TCB_FIN_WAIT_2
-	dd	.step6		;TCB_ESTABLISHED
+	dd	.ack_tw 	;TCB_TIMED_WAIT
-	dd	.step6		;TCB_CLOSE_WAIT
-	dd	._963		;TCB_FIN_WAIT_1
-	dd	._958		;TCB_CLOSING
+  .ack_fw1:
-	dd	._999		;TCB_LAST_ACK
-	dd	.step6		;TCB_FIN_WAIT_2
+;;; TODO: 963
-	dd	._1010		;TCB_TIMED_WAIT
 	jmp	.ack_processed
-  ._963:
+  .ack_c:
 	mov	[ebx + SOCKET.lock], 0
 	;;; if debug enabled, output packet
-	;test    ;;;needoutput = 1
+	;test    needoutput, needoutput
-	;jnz     .outputnow
-	test	[ebx + TCP_SOCKET.t_flags], TF_ACKNOW
-	jnz	.ack_now
-	call	kernel_free
-	add	esp, 4
+	;jz      .dumpit
 	ret
 	test	[ebx + TCP_SOCKET.t_flags], TF_ACKNOW
-  .ack_now:
+	jz	.dumpit
+	DEBUGF	1,"ACK now!\n"
-	DEBUGF	1,"ACK now!\n"
+	push	ebx
 	mov	eax, ebx
-	push	ebx
+	call	TCP_output
-	mov	eax, ebx
+	pop	ebx
+;
 ;-------------------------
 align 4
 TCP_close:
+	DEBUGF	1,"TCP_close\n"
 ;;; TODO: update RTT and mean deviation
 ;;; TODO: update slow start threshold
+;;; TODO: release connection resources
+; Now, mark the socket as being disconnected
-;;; TODO: release connection resources
+	mov	[eax + SOCKET.state], 0 ;;; FIXME

Subversion Repositories Kolibri OS

(root)/kernel/branches/net/network/tcp.inc @ 1733 – Rev 1716 → 1719