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

 ;;          GNU GENERAL PUBLIC LICENSE                             ;;
 ;;             Version 2, June 1991                                ;;
 ;;                                                                 ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-$Revision: 1530 $
+$Revision: 1533 $
 ; Socket states
 TCB_CLOSED		equ 0
 	pop	esi
+}	; returns in dx only
+macro	TCP_sendseqinit ptr {
+	push	edi			;;;; i dont like this static use of edi
+	mov	edi, [ptr + TCP_SOCKET.ISS]
+	mov	[ptr + TCP_SOCKET.SND_UP], edi
+	mov	[ptr + TCP_SOCKET.SND_MAX], edi
+	mov	[ptr + TCP_SOCKET.SND_NXT], edi
+	mov	[ptr + TCP_SOCKET.SND_UNA], edi
+	pop	edi
+}
+macro	TCP_rcvseqinit ptr {
+	push	edi
+	mov	edi, [ptr + TCP_SOCKET.IRS]
+	inc	edi
+	mov	[ptr + TCP_SOCKET.RCV_NXT], edi
+	mov	[ptr + TCP_SOCKET.RCV_ADV], edi
+	pop	edi
 }	; returns in dx only
 	;;;; do something with eax
 ;-----------------------------------
 ; Is this socket a listening socket?
-;        test    [ebx + SOCKET.options], SO_ACCEPTCON
+	test	[ebx + SOCKET.options], SO_ACCEPTCON
 ;        jnz     .listening_socket                       ;;;;; TODO
 	test	[edx + TCP_segment.Flags], TH_SYN
 	jz	@f
 	movzx	eax, word[edi+2]
 	rol	ax, 8
-	DEBUGF	1,"Maxseg: %u", ax
+	DEBUGF	1,"Maxseg: %u\n", ax
 	mov	[ebx + TCP_SOCKET.t_maxseg], eax
 	jne	.no_options
 	test	[edx + TCP_segment.Flags], TH_SYN
 	jz	@f
-	DEBUGF	1,"Got window option"
+	DEBUGF	1,"Got window option\n"
 	;;;;;
   .opt_timestamp:
 	cmp	byte [edi+1], 10
 	jne	.no_options
-	DEBUGF	1,"Got timestamp option"
+	DEBUGF	1,"Got timestamp option\n"
 ;      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
-	jnz	.not_uni_xfer
+	DEBUGF	1,"1\n"
+	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
-	jnz	.not_uni_xfer
+	DEBUGF	1,"2\n"
+	test	[edx + TCP_segment.Flags], TH_ACK
 	jz	.not_uni_xfer
 	test	[edx + TCP_segment.Flags], TH_ACK
-	jz	.not_uni_xfer
+	DEBUGF	1,"3\n"
+	mov	eax, [edx + TCP_segment.SequenceNumber]
+	cmp	eax, [ebx + TCP_SOCKET.RCV_NXT]
-	mov	eax, [edx + TCP_segment.SequenceNumber]
+	jne	.not_uni_xfer
-	cmp	eax, [ebx + TCP_SOCKET.RCV_NXT]
+	DEBUGF	1,"4\n"
-	jne	.not_uni_xfer
+;;        movzx   eax, [edx + TCP_segment.Window] ;;;;; (should use pre-calculated value isntead: todo: figure out where to store it)
 ;;        cmp     eax, [ebx + TCP_SOCKET.SND_WND]
-	movzx	eax, [edx + TCP_segment.Window] ;;;;; (should use pre-calculated value isntead: todo: figure out where to store it)
+;;        jne     .not_uni_xfer
 ; Update RTT estimators
 ; Delete acknowledged bytes from send buffer
 ; notice how ecx already holds number of bytes ack-ed
-	lea	eax, [ebx + snd]
+	lea	eax, [ebx + STREAM_SOCKET.snd]
 	call	SOCKET_ring_free
 ; Complete processing of received data
 	DEBUGF	1,"header prediction: we are receiver\nreceiving %u bytes of data\n", ecx
 	add	esi, edx
+	lea	eax, [ebx + STREAM_SOCKET.rcv]
+	call	SOCKET_ring_write			; Add the data to the socket buffer
-	lea	eax, [ebx + rcv]
+	mov	eax, ebx
-	call	SOCKET_ring_add 			; Add the data to the socket buffer
+	call	SOCKET_notify_owner
 ;----------------------------------------------------
 ; Header prediction failed, doing it the slow way..     ;;;;; current implementation of header prediction destroys some regs (ecx) !!
   .not_uni_xfer:
-	DEBUGF	1,"Header prediction failed\n"
+	DEBUGF	1,"Header prediction failed\n"		; time to do it the "slow" way :)
-;------------------------------
-; Calculate receive window size
-	;;;;
-;-------------------------
+;------------------------------
-; TCP slow input procedure
+; Calculate receive window size
-	DEBUGF	1,"TCP slow input procedure\n"
+	;;;;
 	cmp	[ebx + TCP_SOCKET.t_state], TCB_LISTEN
 	je	.LISTEN
 	cmp	[ebx + TCP_SOCKET.t_state], TCB_SYN_SENT
 	jnz	.drop_with_reset
 	test	[edx + TCP_segment.Flags], TH_SYN
 	jz	.drop
+	cmp	esi, 0xffffff		; destination ip = 255.255.255.255 ?
 	jz	.drop
 	; TODO: find sender ip address somewhere!
 	; TODO: check if it's a broadcast or multicast, and drop if so
 	mov	[eax + TCP_SOCKET.t_state], TCB_SYN_RECEIVED
 	mov	[eax + TCP_SOCKET.t_flags], TF_ACKNOW
 	mov	[eax + TCP_SOCKET.timer_keepalive], TCP_time_keep_interval
-	mov	ebx, eax
 	mov	ebx, eax
 	jmp	.trim_then_step6
 	mov	eax, [edx + TCP_segment.AckNumber]
 	cmp	eax, [ebx + TCP_SOCKET.ISS]
-	jle	.drop_with_reset
-	DEBUGF	1,"snd_max = %x\n", [ebx + TCP_SOCKET.SND_MAX]	 ;;; TODO: set this, but where?
+	jle	.drop_with_reset
 ;        mov     eax, [edx + TCP_segment.AckNumber]
-;;        cmp     eax, [ebx + TCP_SOCKET.SND_MAX]
+	cmp	eax, [ebx + TCP_SOCKET.SND_MAX]
-;;        jg      .drop_with_reset
+	jg	.drop_with_reset
        @@:
 	mov	[ebx + TCP_SOCKET.timer_retransmission], 0	; disable retransmission
 	push	[edx + TCP_segment.SequenceNumber]
 	pop	[ebx + TCP_SOCKET.IRS]
-;;; TODO: tcp_rcvseqinit
+	TCP_rcvseqinit ebx
 	jz	.simultaneous_open
 	DEBUGF	1,"TCP: active open\n"
 ; TODO: update stats
-; TODO: set socket state to connected
+; TODO: set general socket state to connected
   .trim_then_step6:
+  .trim_then_step6:
-	DEBUGF	1,"Trimming window\n"
+;----------------------------
 ; trim any data not in window
 ;----------------------------
-; trim any data not in window
+	DEBUGF	1,"Trimming window\n"
 	mov	eax, [ebx + TCP_SOCKET.RCV_NXT]
 	sub	eax, [edx + TCP_segment.SequenceNumber]
 	jmp	.no_drop
        @@:
 	and	[edx + TCP_segment.Flags], not (TH_URG)
-	dec	eax
+	dec	eax
 	jz	.no_duplicate
   .no_drop:
-	DEBUGF	1,"Going to drop %u bytes of data", eax
+	DEBUGF	1,"Going to drop %u out of %u bytes\n", eax, ecx
 	cmp	[edx + TCP_segment.Flags], TH_ACK
 	jz	.drop_after_ack
   .duplicate:
-	DEBUGF	1,"Duplicate received"
+	DEBUGF	1,"Duplicate received\n"
 ;--------------------------------------------------
 ; Handle data that arrives after process terminates
 	cmp	[ebx + SOCKET.PID], 0
-	jge	@f
+	jg	@f
 	;;; Close the socket
 	;;; update stats
 	jmp	.drop_with_reset
 	jmp	.drop_with_reset
        @@:
 	cmp	[ebx + TCP_SOCKET.t_state], TCB_SYN_RECEIVED
 	jg	.ack_dup
+	jl	.ack_nodup
-	jl	.ack_nodup
+	DEBUGF	1,"TCP state = syn received"
+	;;;;;
-	;;;;;
+  .ack_dup:
-  .ack_dup:
+	DEBUGF	1,"Duplicate ACK"
+	;;;;
-	;;;;
+  .ack_nodup:
-  .ack_nodup:
+	;;;; 887
 	cmp	eax, [edx + TCP_segment.AckNumber]
 	je	.all_outstanding
 	mov	[ebx + TCP_SOCKET.timer_retransmission], 120 ;;;; TODO: correct this value
   .all_outstanding:
 ;-------------------------------------------
 ; Open congestion window in response to ACKs
 	;;;;
 ;------------------------------------------
 ; Remove acknowledged data from send buffer
-	lea	eax, [ebx + snd]
+	xor	ecx, ecx	;;;;;;
 ; Ignore bogus urgent offsets
 	;;; 1040-1050
 	movzx	eax, [edx + TCP_segment.UrgentPointer]
-	add	eax, [ebx + rcv.size]
+	add	eax, [ebx + STREAM_SOCKET.rcv + RING_BUFFER.size]
 	cmp	eax, SOCKET_MAXDATA
 	jle	.not_urgent
 ;--------------------------------
 ; process the data in the segment
   .do_data:
-	DEBUGF	1,"TCP: do data:\n"
+	DEBUGF	1,"TCP: do data\n"
 	test	[edx + TCP_segment.Flags], TH_FIN
+	jnz	.process_fin
+	cmp	[ebx + TCP_SOCKET.t_state], TCB_FIN_WAIT_1
-	jnz	.process_fin
+	jge	.dont_do_data
+	test	ecx, ecx
+	jz	.final_processing
+	DEBUGF	1,"Processing data in segment\n"
+;; TODO: check if data is in sequence !
+	movzx	eax, [edx + TCP_segment.DataOffset]		;;; todo: remember this in.. edi ?
+	and	eax, 0xf0
+	shr	al, 2
+	lea	esi, [edx + eax]
+	or	[ebx + TCP_SOCKET.t_flags], TF_DELACK
+	add	[ebx + TCP_SOCKET.RCV_NXT], ecx 	 ;;; right ?
 	test	[ebx + TCP_SOCKET.t_state], TCB_FIN_WAIT_1
-	jge	.dont_do_data
+	lea	eax, [ebx + STREAM_SOCKET.rcv]
   .FIN_sw_list:
 	dd	.no_fin 	;TCB_CLOSED
 	dd	.no_fin 	;TCB_LISTEN
 	dd	.no_fin 	;TCB_SYN_SENT
-	dd	._1131		;TCB_SYN_RECEIVED
+	dd	.fin_syn_est	;TCB_SYN_RECEIVED
-	dd	._1131		;TCB_ESTABLISHED
+	dd	.fin_syn_est	;TCB_ESTABLISHED
 	dd	.no_fin 	;TCB_CLOSE_WAIT
-	dd	._1139		;TCB_FIN_WAIT_1
+	dd	.fin_wait1	;TCB_FIN_WAIT_1
 	dd	.no_fin 	;TCB_CLOSING
 	dd	.no_fin 	;TCB_LAST_ACK
-	dd	._1147		;TCB_FIN_WAIT_2
+	dd	.fin_wait2	;TCB_FIN_WAIT_2
+	dd	.fin_timed	;TCB_TIMED_WAIT
+  .fin_syn_est:
-	dd	._1156		;TCB_TIMED_WAIT
+	jmp	.final_processing
+  .fin_wait1:
+	jmp	.final_processing
   ._1131:
   .fin_wait2:
   ._1139:
 	jmp	.final_processing
   ._1147:
+  .fin_timed:
 	jmp	.final_processing
   ._1156:
   .no_fin:
-  .no_fin:
+;-----------------
-;-----------------
+; Final processing
 ; Final processing
   .final_processing:
   .final_processing:
 	push	ebx
 	mov	eax, ebx
 	call	TCP_output
 	pop	ebx
 	mov	[ebx + SOCKET.lock], 0
 	call	kernel_free
 	add	esp, 4
 	ret
 	push	ebx
 	mov	eax, ebx
 	call	TCP_output
 	pop	ebx
 	mov	[ebx + SOCKET.lock], 0
 	call	kernel_free
 	add	esp, 4
 	jnz	.respond_ack
 	test	[edx + TCP_segment.Flags], TH_SYN
-	jnz	.respond_syn
 	jnz	.respond_syn
 	mov	[ebx + SOCKET.lock], 0
 	call	kernel_free
 	add	esp, 4
 	ret
   .respond_ack:
-  .respond_ack:
+	mov	dl, TH_RST
-	;;;;
+	push	ebx
+	call	TCP_respond_segment
+	pop	ebx
-	call	TCP_respond_segment
+	jmp	.destroy_new_socket
 	jmp	.destroy_new_socket
   .destroy_new_socket:
 	;;;; kill the newly created socket
 	;;;; kill the newly created socket
 	mov	[ebx + SOCKET.lock], 0
 	jz	.no_persist_timeout
 	test	ecx, ecx
 	jnz	.no_zero_window
-	cmp	ebx, [eax + snd.size]
+	cmp	ebx, [eax + STREAM_SOCKET.snd + RING_BUFFER.size]
 	jge	@f
   .no_persist_timeout:
 ;;;106
-	mov	esi, [eax + snd.size]
+	mov	esi, [eax + STREAM_SOCKET.snd + RING_BUFFER.size]
 	cmp	esi, ecx
 	jl	@f
 ;;; 128
 	mov	edi, [eax + TCP_SOCKET.SND_NXT]
 	add	edi, esi	; len
 	sub	edi, [eax + TCP_SOCKET.SND_UNA]
-	add	edi, [eax + snd.size]
+	add	edi, [eax + STREAM_SOCKET.snd + RING_BUFFER.size]
 	cmp	edi, 0
 	jle	@f
 ; set ecx to space available in receive buffer
 ; From now on, ecx will be the window we advertise to the other end
 	mov	ecx, SOCKET_MAXDATA
-	sub	ecx, [eax + rcv.size]
+	sub	ecx, [eax + STREAM_SOCKET.rcv + RING_BUFFER.size]
 	; edx = flags
 	; ecx = data size
 	; edi = header size
 	; esi = snd ring buff ptr
+	mov	ecx, [eax + STREAM_SOCKET.snd + RING_BUFFER.size]
+	cmp	ecx, [eax + TCP_SOCKET.t_maxseg]			;;; right?
+	jle	@f
+	mov	ecx, [eax + TCP_SOCKET.t_maxseg]
-	xor	ecx, ecx	;;;;;
+       @@:
 	add	ecx, edi	; total TCP segment size
-	push	edi	; header size
+	push	edi		; header size
 ; Create the IP packet
 	mov	ebx, [eax + IP_SOCKET.LocalIP]	; source ip
-	mov	eax, [eax + IP_SOCKET.RemoteIP] ; dest ip
-;        mov     ecx,                            ; data length
-;        mov     dx,                             ; fragment id
+	mov	eax, [eax + IP_SOCKET.RemoteIP] ; dest ip
 	mov	di, IP_PROTO_TCP shl 8 + 128
 	call	IPv4_output
 	jz	.fail
-;-----------------------------------------
-; Move TCP header from stack to TCP packet
-;        pop     ecx                     ; header size
+;-----------------------------------------
-;        mov     esi, esp
-;        add     esp, ecx
-;        shr     ecx, 2
+; Move TCP header from stack to TCP packet
-;        rep     movsd
 	push	ecx
-	mov	ecx, [esp]
+	mov	ecx, [esp+4]
+	lea	esi, [esp+4+4]
-	lea	esi, [esp+4]
+	shr	ecx, 2
-	shr	ecx, 2
+	rep	movsd
-	rep	movsd
 	pop	ecx		; full TCP packet size
-	pop	ecx
+	pop	esi		; headersize
+	add	esp, esi
-	add	esp, ecx
+	mov	[esp + 4], eax		; packet ptr
 	mov	[esp + 4+4], edx	; packet size
 	mov	[esp + 4+4], edx	; packet size
-	mov	[esp + 4], eax		; packet ptr
+	mov	edx, edi		; begin of data
 	sub	edx, esi		; begin of packet (edi = begin of data)
-	mov	edx, edi
+	push	ecx
-	sub	edx, ecx
+	sub	ecx, esi		; data size
 ;--------------
 ; Copy the data
 ; eax = ptr to ring struct
+; ecx = buffer size
+; edi = ptr to buffer
+	mov	eax, [esp+4]		  ; socket ptr
+	push	edx
+	add	eax, STREAM_SOCKET.snd
+	call	SOCKET_ring_read
+	pop	esi ecx
+	pop	eax
+	test	[esi + TCP_segment.Flags], TH_SYN + TH_FIN
+	jz	@f
+	inc	[eax + TCP_SOCKET.SND_NXT]
+	;;; TODO: update sentfin flag
+       @@:
+;;        add     [eax + TCP_SOCKET.SND_NXT], ecx
-; ecx = buffer size
+	mov	edx, [eax + TCP_SOCKET.SND_NXT]
-; edi = ptr to buffer
+	cmp	edx, [eax + TCP_SOCKET.SND_MAX]
 	jle	@f
-	mov	eax, [esp]		; socket ptr
+	mov	[eax + TCP_SOCKET.SND_MAX], edx
 	push	ecx edx
 	mov	ebx, [edx - 20 + IPv4_Packet.SourceAddress]	 ;;;; and what if ip packet had options?!
 	mov	eax, [edx - 20 + IPv4_Packet.DestinationAddress]   ;;;
 	mov	ecx, TCP_segment.Data
 	mov	di , IP_PROTO_TCP shl 8 + 128
 	call	IPv4_output
-	test	edi, edi
 	jz	.error
 	pop	esi cx
 	push	edx eax
 ;---------------------------------------------------

Subversion Repositories Kolibri OS

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