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

 ;;             Version 2, June 1991                                ;;
 ;;                                                                 ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-$Revision: 1249 $
-TCB_LISTEN		equ 1
-TCB_SYN_SENT		equ 2
-TCB_SYN_RECEIVED	equ 3
-TCB_ESTABLISHED 	equ 4
-TCB_FIN_WAIT_1		equ 5
-TCB_FIN_WAIT_2		equ 6
-TCB_CLOSE_WAIT		equ 7
-TCB_CLOSING		equ 8
-TCB_LAST_ACK		equ 9
-TCB_TIMED_WAIT		equ 10
-TCB_CLOSED		equ 11
-TH_FIN			equ 1 shl 0
-TH_SYN			equ 1 shl 1
-TH_RST			equ 1 shl 2
-TH_PUSH 		equ 1 shl 3
-TH_ACK			equ 1 shl 4
-TH_URG			equ 1 shl 5
-TWOMSL			equ 10		; # of secs to wait before closing socket
+$Revision: 1254 $
 TCP_RETRIES		equ 5		; Number of times to resend a Packet
-TCP_RETRIES		equ 5		; Number of times to resend a Packet
+TCP_PACKET_TTL		equ 50		; resend if not replied to in 1/100 s
 endg
 align 4
 iglobal
-TCBStateHandler:
+stateHandler:
   dd  stateTCB_LISTEN
   dd  stateTCB_CLOSED
-endg
-macro inc_INET reg {
-	inc	byte [reg + 0]
-	adc	byte [reg + 1], 0
-	adc	byte [reg + 2], 0
-	adc	byte [reg + 3], 0
-}
-macro add_INET reg {
-	rol	ecx, 16
-	adc	byte [reg + 0], ch
-	adc	byte [reg + 1], cl
-	rol	ecx, 16
-	adc	byte [reg + 2], ch
-	adc	byte [reg + 3], cl
-}
 endg
 ;-----------------------------------------------------------------
+;
 	mov	edi, TCP_PACKETS_TX
 	mov	ecx, 2*MAX_IP
 	rep	stosd
+	init_queue TCP_IN_QUEUE
+	; tcp_out_queue is a special type of queue
-	init_queue TCP_IN_QUEUE
+	xor	eax, eax
+	mov	esi, TCP_OUT_QUEUE
+	mov	ecx, TCP_QUEUE_SIZE*tcp_out_queue_entry/4+1
-	init_queue TCP_OUT_QUEUE
+	rep	stosd
 	jz	.exit
 	cmp	[ebx + SOCKET_head.Type], IP_PROTO_TCP
 	jne	.next_socket
-;        DEBUGF  1, "K :   %x-%x: %x-%x-%x-%u\n", [ebx + SOCKET.PID]:2, [ebx + SOCKET.Number]:2, [ebx + SOCKET.LocalPort]:4, [ebx + SOCKET.RemoteIP], [ebx + SOCKET.RemotePort]:4, [ebx + SOCKET.TCBState]
+;        DEBUGF  1, "K :   %x-%x: %x-%x-%x-%u\n", [ebx + SOCKET.PID]:2, [ebx + SOCKET.Number]:2, [ebx + SOCKET.LocalPort]:4, [ebx + SOCKET.RemoteIP], [ebx + SOCKET.RemotePort]:4, [ebx + SOCKET.state]
-	cmp	[ebx + SOCKET_head.end + IPv4_SOCKET.end + TCP_SOCKET.TCBTimer], 0
+	cmp	[ebx + SOCKET_head.end + IPv4_SOCKET.end + TCP_SOCKET.timer], 0
 	jne	.decrement_tcb
 	cmp	[ebx + SOCKET_head.end + IPv4_SOCKET.end + TCP_SOCKET.wndsizeTimer], 0
 	jne	.decrement_wnd
 	jmp	.next_socket
   .decrement_tcb:
 	; decrement it, delete socket if TCB timer = 0 & socket in timewait state
-	dec	[ebx + SOCKET_head.end + IPv4_SOCKET.end + TCP_SOCKET.TCBTimer]
+	dec	[ebx + SOCKET_head.end + IPv4_SOCKET.end + TCP_SOCKET.timer]
 	jnz	.next_socket
   .found_one:
 	dec	[esi + tcp_out_queue_entry.ttl]
 	jz	.send_it
+  .find_next:
-  .find_next:
+	add	esi, tcp_out_queue_entry.size
 	dec	eax
+	jz	.exit
-	jz	.exit
+	test	ecx, ecx
+	jnz	.loop
-	jmp	.loop
+	ret
+  .send_it:
-  .send_it:
+	push	eax ecx esi
 	push	eax ecx esi
+	mov	ebx, [esi + tcp_out_queue_entry.owner]
-	push	[esi + tcp_out_queue_entry.data_size]
-	push	[esi + tcp_out_queue_entry.data_ptr]
+	push	[esi + tcp_out_queue_entry.data_size]
-	mov	ebx, [esi + tcp_out_queue_entry.owner]
+	push	[esi + tcp_out_queue_entry.data_ptr]
 	DEBUGF 1,"Now sending TCP packet %x, size: %u, owner: %x, sendproc %x\n", [esp], [esp+4], ebx, [esi + tcp_out_queue_entry.sendproc]
 	call	[esi + tcp_out_queue_entry.sendproc]
 	add	esp, 8
+	pop	esi ecx eax
-	pop	esi ecx eax
 	dec	[esi + tcp_out_queue_entry.retries]
-	dec	[esi + tcp_out_queue_entry.retries]
+	jz	.remove_it
 	jz	.remove_it
-	mov	[esi + tcp_out_queue_entry.ttl], TCP_TIMEOUT
+	mov	[esi + tcp_out_queue_entry.ttl], TCP_PACKET_TTL
-	jmp	.find_next
 	jmp	.find_next
   .remove_it:
 ;-----------------------------------------------------------------
 align 4
+TCP_add_to_queue:
-TCP_add_to_queue:
+	DEBUGF 1,"Adding packet to TCP queue, buffer: %x, size: %u, driver: %x, acknum: %x\n", [esp], [esp+4], ebx, edx
 	cmp	[TCP_OUT_QUEUE], TCP_QUEUE_SIZE
 	jge	.full
 	je	.found_it
 	add	eax, tcp_out_queue_entry.size
 	loop	.loop
+  .full:			; silently discard the packet
+	DEBUGF 1,"TCP queue is full!\n"
   .full:			; silently discard the packet
 	call	kernel_free
 	add	esp, 4
 	pop	[eax + tcp_out_queue_entry.data_size]
 	mov	[eax + tcp_out_queue_entry.ttl], 1			; send immediately
 	mov	[eax + tcp_out_queue_entry.retries], TCP_RETRIES
 	mov	[eax + tcp_out_queue_entry.owner], ebx
 	mov	[eax + tcp_out_queue_entry.sendproc], esi
-	mov	[eax + tcp_out_queue_entry.ack_num], edx
+	mov	[eax + tcp_out_queue_entry.seq_num], edx
+	inc	[TCP_OUT_QUEUE]
+	sub	eax, TCP_OUT_QUEUE+4
 	DEBUGF 1,"Added to queue in pos %u\n", eax
 align 4
 TCP_handler :
+       DEBUGF 1,"TCP_Handler\n"
-       DEBUGF 1,"TCP_Handler\n"
+	; TODO: validate checksum
 	; IP Packet TCP Destination Port = local Port
 	; IP Packet SA = Remote IP  OR = 0
 	mov	ax, [ebx + SOCKET_head.end + IPv4_SOCKET.end + TCP_SOCKET.RemotePort]
 	cmp	[edx + TCP_Packet.SourcePort] , ax
 	je	.change_state
 	test	ax, ax
-	jne	.socket_loop
+	jnz	.socket_loop
+  .change_state:
-  .change_state:
+       DEBUGF 1,"Found valid socket for packet\n"
 	push	ebx
 ; ebx is pointer to socket
 ; ecx is size of tcp packet
 ; edx is pointer to tcp packet
 	; as a Packet has been received, update the TCB timer
-	mov	[ebx +	SOCKET_head.end + IPv4_SOCKET.end + TCP_SOCKET.TCBTimer], TWOMSL
+	mov	[ebx +	SOCKET_head.end + IPv4_SOCKET.end + TCP_SOCKET.timer], TCP_SOCKET_TTL
 	; If the received Packet has an ACK bit set, remove any Packets in the resend queue that this received Packet acknowledges
 	test	[edx + TCP_Packet.Flags], TH_ACK
+	jz	.call_handler					; No ACK, so no data yet
+;        mov     eax, [edx + TCP_Packet.SequenceNumber]          ; Calculate sequencenumber in eax
-	jz	.call_handler					; No ACK, so no data yet
+;        bswap   eax                                             ;
+;        add     eax, ecx                                        ;
 	mov	eax, [edx + TCP_Packet.SequenceNumber]		; Calculate sequencenumber in eax
-	bswap	eax						;
+	mov	eax, [edx + TCP_Packet.AckNumber]
-	add	eax, ecx					;
 	;---------
+	cmp	[TCP_OUT_QUEUE], 0
+	je	.call_handler
-	cmp	[TCP_OUT_QUEUE], 0
+	push	ecx
 	je	.call_handler
        DEBUGF 1,"Removing all queued packets with smaller ACK\n"
 	push	ecx
 	mov	ecx, TCP_QUEUE_SIZE
 	mov	esi, TCP_OUT_QUEUE+4
+  .loop:
+	cmp	[esi + tcp_out_queue_entry.data_ptr], 0
+	je	.maybe_next
-  .loop:
+	cmp	[esi + tcp_out_queue_entry.seq_num], eax
-	cmp	[esi + tcp_out_queue_entry.data_ptr], 0
+	jg	.maybe_next
-	jne	.maybe_next
+	; TODO: check if the packets belong to the same tcp connection !
 	cmp	[esi + tcp_out_queue_entry.ack_num], eax
-	jg	.maybe_next
+       DEBUGF 1,"Removing a queued packet\n"
 	push	[esi + tcp_out_queue_entry.data_ptr]
-	mov	[esi + tcp_out_queue_entry.data_ptr], 0
+	mov	[esi + tcp_out_queue_entry.data_ptr], 0
 	dec	[TCP_OUT_QUEUE]
 	call	kernel_free
+  .maybe_next:
+	add	esi, tcp_out_queue_entry.size
-  .maybe_next:
+	loop	.loop
-	add	esi, tcp_out_queue_entry.size
-	loop	.loop
+	pop	ecx
-	pop	ecx
+  .call_handler:
+	; Call handler for given TCB state
 	mov	eax, [ebx +  SOCKET_head.end + IPv4_SOCKET.end + TCP_SOCKET.state]
-  .call_handler:
+	DEBUGF 1,"Socket state: %u\n", eax
-	; Call handler for given TCB state
-	mov	eax, [ebx +  SOCKET_head.end + IPv4_SOCKET.end + TCP_SOCKET.TCBState]
-	cmp	eax, TCB_LISTEN
-	jb	.exit
-	cmp	eax, TCB_CLOSED
-	ja	.exit
+	cmp	eax, TCB_LISTEN
 	jb	.dump
-	shl	eax, 2
+	cmp	eax, TCB_CLOSED
-	add	eax, TCBStateHandler - 4
+	ja	.dump
 	push	eax
 	push	ebx
 	push	ecx esi eax		; save some variables for later
-	add	ecx, TCP_Packet.Data
+	add	ecx, TCP_Packet.Options
 	call	IPv4_create_packet
 	cmp	edi, -1
 	pop	[edi + TCP_Packet.AckNumber]
 	mov	al, [eax + SOCKET_head.end + IPv4_SOCKET.end + TCP_SOCKET.flags]
 	mov	[edi + TCP_Packet.Flags], al
-	mov	[edi + TCP_Packet.Window], 0x0005	   ; 1280 bytes               ;;; TODO: read RFC !
+	mov	[edi + TCP_Packet.Window], 0x0005	   ; 1280 bytes
 	mov	[edi + TCP_Packet.UrgentPointer], 0
 	mov	[edi + TCP_Packet.DataOffset], 0x50
 	mov	[edi + TCP_Packet.Checksum], 0
 ; Copy the data
 	mov	esi, [esp]
 	mov	ecx, [esp+4]
-	add	edi, TCP_Packet.Data
+	add	edi, TCP_Packet.Options
 	call	checksum_2
 	mov	[edi + TCP_Packet.Checksum], dx
 ; And now, send it!
 	DEBUGF 1,"Sending TCP Packet to device %x\n", ebx
-	mov	esi, ETH_sender
+	lea	esi, [ebx+ETH_DEVICE.transmit]
 	mov	edx, [edi + TCP_Packet.AckNumber]
 	jmp	TCP_add_to_queue
   .fail:
 ;-----------------------------------------------------------------
 align 4
 TCP_send_ack:
-	DEBUGF 1,"Creating TCP ACK\n"
+	DEBUGF 1,"Creating TCP ACK, socket: %x, flags: %x\n",eax, bl
 	mov	di , IP_PROTO_TCP
+	mov	ecx, TCP_Packet.Options
 	mov	cx , TCP_Packet.Data
 	push	bx eax
 	push	bx eax
 ; Create an IPv4 Packet of the correct size
 	pop	esi
 	push	[esi + SOCKET_head.end + IPv4_SOCKET.end + TCP_SOCKET.SND_NXT]
 	pop	[edi + TCP_Packet.SequenceNumber]
-	push	dword [esi + SOCKET_head.end + IPv4_SOCKET.end + TCP_SOCKET.LocalPort]
+	push	dword [esi + SOCKET_head.end + IPv4_SOCKET.end + TCP_SOCKET.LocalPort] ; both ports at once
 	pop	dword [edi + TCP_Packet.SourcePort]
-	push	[esi + SOCKET_head.end + IPv4_SOCKET.end + TCP_SOCKET.SND_NXT]
+	push	[esi + SOCKET_head.end + IPv4_SOCKET.end + TCP_SOCKET.RCV_NXT]
 	pop	[edi + TCP_Packet.AckNumber]
 	pop	cx
+	mov	[edi + TCP_Packet.Flags], cl
-	mov	[edi + TCP_Packet.Flags], cl
+	mov	[edi + TCP_Packet.Window], 0x0005	   ; 1280 bytes
+	mov	[edi + TCP_Packet.UrgentPointer], 0
+	mov	[edi + TCP_Packet.DataOffset], 0x50
+	mov	[edi + TCP_Packet.Checksum], 0
-	mov	[edi + TCP_Packet.Window], 0x0005	   ; 1280 bytes
+	push	edx eax
-	mov	[edi + TCP_Packet.UrgentPointer], 0
-	mov	[edi + TCP_Packet.DataOffset], 0x50
+	lea	esi, [esi + SOCKET_head.end + IPv4_SOCKET.end + TCP_SOCKET.SND_NXT]
+	inc_INET esi
-	push	eax edx
+; Now, calculate the checksum
+	pushw	TCP_Packet.Options shl 8
+	pushw	IP_PROTO_TCP shl 8
-	push	word TCP_Packet.Data shl 8
+	pushd	[edi-4] ; destination address
-	push	IP_PROTO_TCP
+	pushd	[edi-8] ; source address
 	push	[esi + SOCKET_head.end + SOCKET_head.end + IPv4_SOCKET.RemoteIP]
-	push	[esi + SOCKET_head.end + SOCKET_head.end + IPv4_SOCKET.LocalIP]
+	xor	edx, edx
+	mov	ecx, TCP_Packet.Options
-; Now, calculate the checksum for pseudoheader
+	mov	esi, edi
-	xor	edx, edx
+	call	checksum_1
 	mov	ecx, 12
 	mov	esi, esp
 	call	checksum_1
 	add	esp, 12 				   ; remove the pseudoheader from stack
-; Now create the final checksum and store it in TCP header
+; and store it in TCP header
 	call	checksum_2
 	mov	[edi + TCP_Packet.Checksum], dx
-; And now, send it!
+; And now, send the packet!
 	DEBUGF 1,"Sending TCP Packet to device %x\n", ebx
+	mov	esi, [ebx + ETH_DEVICE.transmit]
+	mov	edx, [edi + TCP_Packet.SequenceNumber]
+	jmp	TCP_add_to_queue
 	mov	esi, ETH_sender
-	mov	edx, [edi + TCP_Packet.AckNumber]
+  .fail:
-	jmp	TCP_add_to_queue
+	add	esp, 2+4
 	ret
 	lea	esi, [ebx + SOCKET_head.end + IPv4_SOCKET.end + TCP_SOCKET.RCV_NXT]
 	inc_INET esi ; RCV.NXT
 	mov	eax, [ebx + SOCKET_head.end + IPv4_SOCKET.end + TCP_SOCKET.ISS]
 	mov	[ebx + SOCKET_head.end + IPv4_SOCKET.end + TCP_SOCKET.SND_NXT], eax
+	mov	[ebx + SOCKET_head.lock], 0
 	; Now construct the response
 	mov	bl, TH_SYN + TH_ACK
 	call	TCP_send_ack
-	mov	[ebx +	SOCKET_head.end + IPv4_SOCKET.end + TCP_SOCKET.TCBState], TCB_SYN_RECEIVED
+	mov	[ebx +	SOCKET_head.end + IPv4_SOCKET.end + TCP_SOCKET.state], TCB_SYN_RECEIVED
 	; increment SND.NXT in socket
+	lea	esi, [ebx + SOCKET_head.end + IPv4_SOCKET.end + TCP_SOCKET.SND_NXT]
-	lea	esi, [ebx + SOCKET_head.end + IPv4_SOCKET.end + TCP_SOCKET.SND_NXT]
+	inc_INET esi
 	inc_INET esi
   .exit:
+	mov	[ebx + SOCKET_head.lock], 0
+	ret
   .exit:
-	ret
+align 4
 stateTCB_SYN_SENT:
 	je	.syn_ack
 	test	al, TH_SYN
 	jz	.exit
-	mov	[ebx +	SOCKET_head.end + IPv4_SOCKET.end + TCP_SOCKET.TCBState], TCB_SYN_RECEIVED
+	mov	[ebx +	SOCKET_head.end + IPv4_SOCKET.end + TCP_SOCKET.state], TCB_SYN_RECEIVED
-	push	TH_SYN + TH_ACK
+	pushd	TH_SYN + TH_ACK
 	jmp	.send
   .syn_ack:
-	mov	[ebx +	SOCKET_head.end + IPv4_SOCKET.end + TCP_SOCKET.TCBState], TCB_ESTABLISHED
+	mov	[ebx +	SOCKET_head.end + IPv4_SOCKET.end + TCP_SOCKET.state], TCB_ESTABLISHED
-	push	TH_ACK
+	pushd	TH_ACK
-  .send:
-	; Store the recv.nxt field
+  .send:
+	; Store the recv.nxt field
+	mov	eax, [edx + TCP_Packet.SequenceNumber]
-	mov	eax, [edx + TCP_Packet.SequenceNumber]
+	mov	[ebx +	SOCKET_head.end + IPv4_SOCKET.end + TCP_SOCKET.IRS], eax
+	bswap	eax
-	; Update our recv.nxt field
+	inc	eax
+	bswap	eax
-	mov	[ebx +	SOCKET_head.end + IPv4_SOCKET.end + TCP_SOCKET.RCV_NXT], eax
+	mov	[ebx +	SOCKET_head.end + IPv4_SOCKET.end + TCP_SOCKET.RCV_NXT], eax	      ; Update our recv.nxt field
-	lea	esi, [ebx +  SOCKET_head.end + IPv4_SOCKET.end + TCP_SOCKET.RCV_NXT]
+	mov	[ebx + SOCKET_head.lock], 0
 	inc_INET esi
+	; Send an ACK
 	mov	eax, ebx
-	; Send an ACK
+	pop	ebx
-	pop	ebx
+	call	TCP_send_ack
+  .exit:
+	mov	[ebx + SOCKET_head.lock], 0
-	call	TCP_send_ack
+	ret
   .exit:
 	ret
 align 4
+stateTCB_SYN_RECEIVED:
-align 4
+	DEBUGF	1,"TCBStateHandler: Syn_received\n"
-stateTCB_SYN_RECEIVED:
 	; In this case, we are expecting an ACK Packet
 	; For now, if the Packet is an ACK, process it,
 	; If not, ignore it
 	test	[edx + TCP_Packet.Flags], TH_RST
 	jz	.check_ack
-	push	[ebx + SOCKET_head.end + IPv4_SOCKET.end + TCP_SOCKET.OrigRemotePort]
+  ;      push    [ebx + SOCKET_head.end + IPv4_SOCKET.end + TCP_SOCKET.OrigRemotePort]
+ ;       pop     [ebx + SOCKET_head.end + IPv4_SOCKET.end + TCP_SOCKET.RemotePort]
-	pop	[ebx + SOCKET_head.end + IPv4_SOCKET.end + TCP_SOCKET.RemotePort]
+  ;      push    [ebx + SOCKET_head.end + IPv4_SOCKET.end + TCP_SOCKET.OrigRemoteIP]
-	push	[ebx + SOCKET_head.end + IPv4_SOCKET.end + TCP_SOCKET.OrigRemoteIP]
+ ;       pop     [ebx + SOCKET_head.end + IPv4_SOCKET.RemoteIP]
 	pop	[ebx + SOCKET_head.end + IPv4_SOCKET.RemoteIP]
+	mov	[ebx + SOCKET_head.end + IPv4_SOCKET.end + TCP_SOCKET.state], TCB_LISTEN
+	jmp	.exit
+  .check_ack:
 	; Look at control flags - expecting an ACK
-	mov	[ebx + SOCKET_head.end + IPv4_SOCKET.end + TCP_SOCKET.TCBState], TCB_LISTEN
+	test	[edx + TCP_Packet.Flags], TH_ACK
-	jmp	.exit
+	jz	.exit
-  .check_ack:
+	mov	[ebx + SOCKET_head.end + IPv4_SOCKET.end + TCP_SOCKET.state], TCB_ESTABLISHED
 	; Look at control flags - expecting an ACK
+  .exit:
-	test	[edx + TCP_Packet.Flags], TH_ACK
+	mov	[ebx + SOCKET_head.lock], 0
-	jz	.exit
+	ret
 	mov	[ebx + SOCKET_head.end + IPv4_SOCKET.end + TCP_SOCKET.TCBState], TCB_ESTABLISHED
-  .exit:
+align 4
+stateTCB_ESTABLISHED:
 	ret
 	DEBUGF	1,"TCBStateHandler: Established\n"
 	; Here we are expecting data, or a request to close
-align 4
+	; OR both...
 	; recv.nxt is in dword [edx+24], in inet format
 	; recv seq is in [sktAddr]+56, in inet format
 	; just do a comparision
 	mov	ecx, [ebx + SOCKET_head.end + IPv4_SOCKET.end + TCP_SOCKET.RCV_NXT]
-	cmp	[ebx + SOCKET_head.end + IPv4_SOCKET.end + TCP_SOCKET.TCBState], TCB_CLOSE_WAIT
+	cmp	[ebx + SOCKET_head.end + IPv4_SOCKET.end + TCP_SOCKET.state], TCB_CLOSE_WAIT
 	jne	@f
 	mov	ecx, eax
     @@: cmp	ecx, [edx + TCP_Packet.SequenceNumber]
 	jne	.ack
 	test	ecx, ecx
 	jnz	.data
 	; If we had received a fin, we need to ACK it.
+	cmp	[ebx + SOCKET_head.end + IPv4_SOCKET.end + TCP_SOCKET.state], TCB_CLOSE_WAIT
-	cmp	[ebx + SOCKET_head.end + IPv4_SOCKET.end + TCP_SOCKET.TCBState], TCB_CLOSE_WAIT
+	je	.ack
-	je	.ack
+	jmp	.exit
 	jmp	.exit
   .data:
-  .data:
+	DEBUGF	1,"Got data!\n"
+	mov	esi, [esp + 4]
-	mov	esi, [esp + 4]
+	sub	edx, esi
+	mov	edi, edx
-	sub	edx, esi
+	call	socket_internal_receiver
 	mov	edi, edx
-	call	socket_internal_receiver
+  .ack:
+	mov	[ebx + SOCKET_head.lock], 0
+	; Send an ACK
 	mov	eax, ebx
-  .ack:
+	mov	bl, TH_ACK
-	; Send an ACK
+	call	TCP_send_ack
+  .exit:
+	mov	[ebx + SOCKET_head.lock], 0
-	mov	bl, TH_ACK
+	ret
 	call	TCP_send_ack
   .exit:
 	ret
 align 4
 stateTCB_FIN_WAIT_1:
-align 4
+	DEBUGF	1,"TCBStateHandler: Fin_wait_1\n"
-stateTCB_FIN_WAIT_1:
 	; We can either receive an ACK of a fin, or a fin
 	mov	al, [edx + TCP_Packet.Flags]
 	and	al, TH_FIN + TH_ACK
 	cmp	al, TH_ACK
+	jne	@f
-	jne	@f
+	; It was an ACK
+	mov	[ebx + SOCKET_head.end + IPv4_SOCKET.end + TCP_SOCKET.state], TCB_FIN_WAIT_2
 	jmp	.exit
 	; It was an ACK
-	mov	[ebx + SOCKET_head.end + IPv4_SOCKET.end + TCP_SOCKET.TCBState], TCB_FIN_WAIT_2
+    @@: mov	[ebx + SOCKET_head.end + IPv4_SOCKET.end + TCP_SOCKET.state], TCB_CLOSING
+	cmp	al, TH_FIN
-	jmp	.exit
+	je	@f
 	mov	[ebx + SOCKET_head.end + IPv4_SOCKET.end + TCP_SOCKET.state], TCB_TIMED_WAIT
     @@: mov	[ebx + SOCKET_head.end + IPv4_SOCKET.end + TCP_SOCKET.TCBState], TCB_CLOSING
+    @@: lea	esi, [ebx + SOCKET_head.end + IPv4_SOCKET.end + TCP_SOCKET.RCV_NXT]
+	inc_INET esi
-	cmp	al, TH_FIN
+	mov	[ebx + SOCKET_head.lock], 0
-	je	@f
+	; Send an ACK
-	mov	[ebx + SOCKET_head.end + IPv4_SOCKET.end + TCP_SOCKET.TCBState], TCB_TIMED_WAIT
+	mov	eax, ebx
+	mov	bl, TH_ACK
-    @@: lea	esi, [ebx + SOCKET_head.end + IPv4_SOCKET.end + TCP_SOCKET.RCV_NXT]
+	call	TCP_send_ack
 	inc_INET esi
+  .exit:
+	mov	[ebx + SOCKET_head.lock], 0
-	; Send an ACK
+	ret
 	mov	bl, TH_ACK
 	call	TCP_send_ack
 align 4
+stateTCB_FIN_WAIT_2:
   .exit:
-	ret
+	DEBUGF	1,"TCBStateHandler: Fin_wait_2\n"
+	test	[edx + TCP_Packet.Flags], TH_FIN
+	jz	.exit
 	; Change state, as we have a fin
+	mov	[ebx + SOCKET_head.end + IPv4_SOCKET.end + TCP_SOCKET.state], TCB_TIMED_WAIT
-align 4
+	lea	esi, [ebx + SOCKET_head.end + IPv4_SOCKET.end + TCP_SOCKET.RCV_NXT]
-stateTCB_FIN_WAIT_2:
+	inc_INET esi
 	test	[edx + TCP_Packet.Flags], TH_FIN
+	mov	[ebx + SOCKET_head.lock], 0
+	; Send an ACK
-	jz	.exit
+	mov	eax, ebx
 	mov	bl, TH_ACK
-	; Change state, as we have a fin
+	call	TCP_send_ack
-	mov	[ebx + SOCKET_head.end + IPv4_SOCKET.end + TCP_SOCKET.TCBState], TCB_TIMED_WAIT
   .exit:
+	mov	[ebx + SOCKET_head.lock], 0
+	ret
 	lea	esi, [ebx + SOCKET_head.end + IPv4_SOCKET.end + TCP_SOCKET.RCV_NXT]
 	inc_INET esi
+align 4
+stateTCB_CLOSE_WAIT:
-	; Send an ACK
+	DEBUGF	1,"TCBStateHandler: close_wait\n"
-	mov	bl, TH_ACK
+	; Intentionally left empty
-	call	TCP_send_ack
+	; socket_close_tcp handles this
+	mov	[ebx + SOCKET_head.lock], 0
 	ret
   .exit:
 	ret
 align 4
 stateTCB_CLOSING:
+	DEBUGF	1,"TCBStateHandler: closingn\n"
+	; We can either receive an ACK of a fin, or a fin
+	test	[edx + TCP_Packet.Flags], TH_ACK
-align 4
+	jz	.exit
 stateTCB_CLOSE_WAIT:
-	; Intentionally left empty
+	mov	[ebx + SOCKET_head.end + IPv4_SOCKET.end + TCP_SOCKET.state], TCB_TIMED_WAIT
+  .exit:
+	mov	[ebx + SOCKET_head.lock], 0
+	ret
 	; socket_close_tcp handles this
+align 4
+stateTCB_LAST_ACK:
+	DEBUGF	1,"TCBStateHandler: last_ackn\n"
+	; Look at control flags - expecting an ACK
+	test	[edx + TCP_Packet.Flags], TH_ACK
+	jz	.exit
+	mov	[ebx + SOCKET_head.lock], 0
+	; delete the socket
+	stdcall net_socket_free, ebx
+  .exit:
+	ret
+align 4
+stateTCB_TIME_WAIT:
+	DEBUGF	1,"TCBStateHandler: time_wait\n"
+	mov	[ebx + SOCKET_head.lock], 0
+	ret
+align 4
+stateTCB_CLOSED:
+	DEBUGF	1,"TCBStateHandler: closed\n"
+	mov	[ebx + SOCKET_head.lock], 0
+	ret

Subversion Repositories Kolibri OS

(root)/kernel/branches/net/network/tcp.inc – Rev 1249 → 1254