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

 ;;             Version 2, June 1991                                ;;
 ;;                                                                 ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-$Revision: 1257 $
+$Revision: 1274 $
 TCP_RETRIES		equ 5		; Number of times to resend a Packet
 	.DataOffset		db ?	; DataOffset[0-3 bits] and Reserved[4-7]
 	.Flags			db ?	; Reserved[0-1 bits]|URG|ACK|PSH|RST|SYN|FIN
 	.Window 		dw ?
 	.Checksum		dw ?
 	.UrgentPointer		dw ?
-	.Options		rb 3
+;        .Options                rb 3
-	.Padding		db ?
+;        .Padding                db ?
 	.Data:
 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 ?
+	.ttl		dd ?
+	.retries	dd ?
+	.owner		dd ?
+	.sendproc	dd ?
+	.seq_num	dd ?
+	.socket 	dd ?
+	.size:
+ends
 align 4
 uglobal
 	TCP_PACKETS_TX		rd  MAX_IP
 	stdcall net_socket_free, ebx
 	pop	ebx
 	jmp	.next_socket
-  .decrement_wnd:
-	; TODO - prove it works!
+  .decrement_wnd:
 	dec	[ebx + SOCKET_head.end + IPv4_SOCKET.end + TCP_SOCKET.wndsizeTimer]
 	jmp	.next_socket
-;-----------------------------------------------------------------
-;
-; TCP_add_to_queue:
-;
-;  Queue a TCP packet for sending
-;
-;  IN:  [esp] pointer to buffer
-;       [esp + 4] size of buffer
-;       ebx = driver struct
-;       esi = sender proc
-;       edx = acknum
-;  OUT: /
-;
-;-----------------------------------------------------------------
-align 4
-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
-	mov	ecx, TCP_QUEUE_SIZE
-	mov	eax, TCP_OUT_QUEUE+4
-  .loop:
-	cmp	[eax + tcp_out_queue_entry.data_ptr], 0
-	je	.found_it
-	add	eax, tcp_out_queue_entry.size
-	loop	.loop
-  .full:			; silently discard the packet
-	DEBUGF 1,"TCP queue is full!\n"
-	call	kernel_free
-	add	esp, 4
-	ret
-  .found_it:			; eax point to empty queue entry
-	pop	[eax + tcp_out_queue_entry.data_ptr]
-	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.seq_num], edx
-	inc	[TCP_OUT_QUEUE]
-	sub	eax, TCP_OUT_QUEUE+4
-	DEBUGF 1,"Added to queue in pos %u\n", eax
-	ret
 ;-----------------------------------------------------------------
+;
 ; TCP_handler:
+;
 ;  Called by IPv4_handler,
 ;  this procedure will inject the tcp data diagrams in the application sockets.
+;
 ;  IN:  Pointer to buffer in [esp]
 ;       size of buffer in [esp+4]
 ;       pointer to device struct in ebx
 ;       TCP Packet size in ecx
-;       pointer to TCP Packet data in edx
+;       pointer to TCP Packet in edx
-;       SourceAddres in esi
+;       SourceAddres (IPv4) in esi
 ;  OUT: /
+;
 	jne	.socket_loop
        @@:
 	mov	ax, [ebx + SOCKET_head.end + IPv4_SOCKET.end + TCP_SOCKET.RemotePort]
 	cmp	[edx + TCP_Packet.SourcePort] , ax
-	je	.change_state
+	je	.found_socket
 	test	ax, ax
-	jnz	.socket_loop
+	jnz	.socket_loop
-  .change_state:
   .found_socket:
        DEBUGF 1,"Found valid socket for packet\n"
-	inc	[TCP_PACKETS_RX]
 	inc	[TCP_PACKETS_RX]
-	push	ebx
-	lea	ebx, [ebx + SOCKET_head.lock]
+	add	ebx, SOCKET_head.lock
 	call	wait_mutex
-	pop	ebx
+	sub	ebx, SOCKET_head.lock
+;-------------------------------
+; ebx is pointer to socket
+; ecx is size of tcp packet
+; edx is pointer to tcp packet
+; calculate header length
+	movzx	eax, [edx + TCP_Packet.DataOffset]
+	and	eax, 11110000b
+	shr	eax, 2
+       DEBUGF 1,"TCP header size: %u\n", eax
-;----------------------------------
+	sub	ecx, eax
 ; ebx is pointer to socket
-; ecx is size of tcp packet
+;-------------------------------
-; edx is pointer to tcp packet
+; ecx is size of tcp data
+; as a Packet has been received, update the TCB timer
-	; as a Packet has been received, update the TCB timer
+	mov	[ebx +	SOCKET_head.end + IPv4_SOCKET.end + TCP_SOCKET.timer], TCP_SOCKET_TTL
-	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	.no_ack 				 ; No ACK, so no data yet
-	; 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
+; Calculate ACK number
-	jz	.call_handler					; No ACK, so no data yet
+	mov	edi, [edx + TCP_Packet.AckNumber]
+	bswap	edi
-;        mov     eax, [edx + TCP_Packet.SequenceNumber]          ; Calculate sequencenumber in eax
-;        bswap   eax                                             ;
-;        add     eax, ecx                                        ;
+	mov	[ebx + SOCKET_head.end + IPv4_SOCKET.end + TCP_SOCKET.last_ack_number], edi
-	mov	eax, [edx + TCP_Packet.AckNumber]
+       DEBUGF 1,"Setting last_ack_number to %u\n", edi
-	mov	[ebx + SOCKET_head.end + IPv4_SOCKET.end + TCP_SOCKET.last_ack_number], eax
-	;---------
+	bswap	edi
-	cmp	[TCP_OUT_QUEUE], 0
-	je	.call_handler
+; Dequeue all acknowledged packets
-	push	ecx
+	cmp	[TCP_OUT_QUEUE], 0		; first, check if any packets are queued at all
 	je	.no_ack
+	push	ecx
+       DEBUGF 1,"Removing all queued packets with smaller ACK\n"
+	mov	ecx, TCP_QUEUE_SIZE
-       DEBUGF 1,"Removing all queued packets with smaller ACK\n"
+	mov	esi, TCP_OUT_QUEUE+4
   .loop:
-	mov	ecx, TCP_QUEUE_SIZE
-	mov	esi, TCP_OUT_QUEUE+4
+	cmp	[esi + tcp_out_queue_entry.data_ptr], 0
 	je	.maybe_next
   .loop:
 	call	kernel_free
   .maybe_next:
 	add	esi, tcp_out_queue_entry.size
-	loop	.loop
 	loop	.loop
+	pop	ecx
-	pop	ecx
+; Now call the correct handler, depending on the socket state
-  .call_handler:
-	; Call handler for given TCB state
+  .no_ack:
-	mov	eax, [ebx +  SOCKET_head.end + IPv4_SOCKET.end + TCP_SOCKET.state]
-	DEBUGF 1,"Socket state: %u\n", eax
+	mov	eax, [ebx +  SOCKET_head.end + IPv4_SOCKET.end + TCP_SOCKET.state]
 	cmp	eax, TCB_LISTEN
 	jb	.dump
 ;-----------------------------------------------------------------
+;
+; TCP_send  (Assumes socket mutex set)
-; TCP_socket_send
+;
 ; IN: eax = socket pointer
-; IN: eax = socket pointer
+;      bl = flags
-;     ecx = number of bytes to send
+;      ecx = number of bytes to send, may be set to 0
-;     esi = pointer to data
+;      esi = pointer to data
 ;
 ;-----------------------------------------------------------------
 align 4
+TCP_send:
-TCP_socket_send:
+	DEBUGF 1,"Creating TCP packet, socket: %x, flags: %x\n",eax, bl
 	DEBUGF 1,"Creating TCP Packet\n"
 	mov	di , IP_PROTO_TCP
-	mov	di , IP_PROTO_TCP
-; Create an IPv4 Packet of the correct size
-	push	eax
-	mov	ebx, [eax + SOCKET_head.end + IPv4_SOCKET.LocalIP]
-	mov	eax, [eax + SOCKET_head.end + IPv4_SOCKET.RemoteIP]
-; meanwhile, create the pseudoheader in stack,
-; (now that we still have all the variables that are needed.)
-	push	cx
-	push	di
+	add	ecx, TCP_Packet.Data
 	push	eax
-	push	ebx
+	push	bx eax esi
+; Create an IPv4 Packet of the correct size
 	mov	ebx, [eax + SOCKET_head.end + IPv4_SOCKET.LocalIP]
-	push	ecx esi eax		; save some variables for later
-	add	ecx, TCP_Packet.Options
-	call	IPv4_create_packet
-	cmp	edi, -1
-	je	.fail
-	pop	esi
-; Now add the TCP header to the IPv4 packet
-	push	[esi + SOCKET_head.end + IPv4_SOCKET.end + TCP_SOCKET.SND_NXT]
+	mov	eax, [eax + SOCKET_head.end + IPv4_SOCKET.RemoteIP]
-	pop	[edi + TCP_Packet.SequenceNumber]
-	push	dword [esi + SOCKET_head.end + IPv4_SOCKET.end + TCP_SOCKET.LocalPort]
-	pop	dword [edi + TCP_Packet.SourcePort]
-	push	[esi + SOCKET_head.end + IPv4_SOCKET.end + TCP_SOCKET.SND_NXT]
-	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
+	call	IPv4_create_packet
-	mov	[edi + TCP_Packet.UrgentPointer], 0
+	cmp	edi, -1
-	mov	[edi + TCP_Packet.DataOffset], 0x50
+	je	.fail
 	mov	[edi + TCP_Packet.Checksum], 0
 ; If there is any data, copy it first
-; Copy the data
+	pop	esi
-	mov	esi, [esp]
+	push	edi
-	mov	ecx, [esp+4]
-	add	edi, TCP_Packet.Options
-	shr	ecx, 1
+	add	edi, TCP_Packet.Data
-	jnc	.nb
-	movsb
-.nb:	shr	ecx, 1
-	jnc	.nw
-	movsw
-.nw:	rep movsd
+	sub	ecx, TCP_Packet.Data
-; Now, calculate the checksum for pseudoheader
-	xor	edx, edx
-	mov	ecx, 12
-	mov	esi, esp
-	call	checksum_1
-	add	esp, 12 				   ; remove the pseudoheader from stack
-; And that of the data
-	pop	esi
-	pop	ecx
-	call	checksum_1
-; Now create the final checksum and store it in TCP header
-	call	checksum_2
-	mov	[edi + TCP_Packet.Checksum], dx
+	shr	ecx, 1
-; And now, send it!
-	DEBUGF 1,"Sending TCP Packet to device %x\n", ebx
-	lea	esi, [ebx+ETH_DEVICE.transmit]
-	mov	edx, [edi + TCP_Packet.AckNumber]
-	jmp	TCP_add_to_queue
-  .fail:
-	add	esp, 12+12+4
-	ret
-;-----------------------------------------------------------------
-;
-; TCP_send_ack
-;
-; IN: eax = socket pointer
-;      bl = flags
-;
-;-----------------------------------------------------------------
-align 4
-TCP_send_ack:
-	DEBUGF 1,"Creating TCP ACK, socket: %x, flags: %x\n",eax, bl
-	mov	di , IP_PROTO_TCP
-	mov	ecx, TCP_Packet.Options
+	jnc	.nb
-	push	bx eax
 	movsb
-; Create an IPv4 Packet of the correct size
+.nb:	shr	ecx, 1
+	jnc	.nw
 	movsw
-	mov	ebx, [eax + SOCKET_head.end + IPv4_SOCKET.LocalIP]
+.nw:	test	ecx, ecx
+	jz	.nd
+	rep	movsd
-	mov	eax, [eax + SOCKET_head.end + IPv4_SOCKET.RemoteIP]
+.nd:
 	pop	edi
-	call	IPv4_create_packet
+; Fill in the TCP header
-	cmp	edi, -1
+	pop	esi
-	je	.fail
+; fill in tcp sequence number
 	push	[esi + SOCKET_head.end + IPv4_SOCKET.end + TCP_SOCKET.SND_NXT]
-; Fill in the TCP header
+	pop	[edi + TCP_Packet.SequenceNumber]
-	pop	esi
+	inc_INET (ebx + SOCKET_head.end + IPv4_SOCKET.end + TCP_SOCKET.SND_NXT) ;;;;;;;;
-	push	[esi + SOCKET_head.end + IPv4_SOCKET.end + TCP_SOCKET.SND_NXT]
+; Fill in local and remote ports
+	push	dword [esi + SOCKET_head.end + IPv4_SOCKET.end + TCP_SOCKET.LocalPort]
-	pop	[edi + TCP_Packet.SequenceNumber]
+	pop	dword [edi + TCP_Packet.SourcePort]
-	push	dword [esi + SOCKET_head.end + IPv4_SOCKET.end + TCP_SOCKET.LocalPort] ; both ports at once
+; Acknumber
-	pop	dword [edi + TCP_Packet.SourcePort]
+	push	[esi + SOCKET_head.end + IPv4_SOCKET.end + TCP_SOCKET.RCV_NXT]
+	pop	[edi + TCP_Packet.AckNumber]
 	push	[esi + SOCKET_head.end + IPv4_SOCKET.end + TCP_SOCKET.RCV_NXT]
-	pop	[edi + TCP_Packet.AckNumber]
+; Fill  in other tcp options
 	pop	cx
-	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.Window], 0x0005	   ; 1280 bytes
+	mov	[edi + TCP_Packet.UrgentPointer], 0
-	mov	[edi + TCP_Packet.UrgentPointer], 0
+	mov	[edi + TCP_Packet.DataOffset], 0x50
-	mov	[edi + TCP_Packet.DataOffset], 0x50
+	mov	[edi + TCP_Packet.Checksum], 0
 	mov	[edi + TCP_Packet.Checksum], 0
 ; Push pointer to and size of total packet (needed for send procedure)
 	push	edx eax
-;        lea     esi, [esi + SOCKET_head.end + IPv4_SOCKET.end + TCP_SOCKET.SND_NXT]
+; push socket number (for TCP_add_to_queue)
-;        inc_INET esi
+	push	esi
-; Now, calculate the checksum
+; Now, calculate the checksum                  ; TODO: calculate correct checksum for packets with data
-	pushw	TCP_Packet.Options shl 8
-	pushw	IP_PROTO_TCP shl 8
+	pushw	TCP_Packet.Data shl 8
+	pushw	IP_PROTO_TCP shl 8
+	pushd	[edi-4] ; destination address  ; TODO: fix this, IPv4 packet could have options..
+	pushd	[edi-8] ; source address
-	pushd	[edi-4] ; destination address  ; TODO: fix this, IPv4 packet could have options..
-	pushd	[edi-8] ; source address
+	xor	edx, edx
 	mov	ecx, TCP_Packet.Data
+	mov	esi, edi
+	call	checksum_1
+	mov	ecx, 12
+	mov	esi, esp
+	call	checksum_1
+	add	esp, 12 				   ; remove the pseudoheader from stack
+; and store it in TCP header
+	call	checksum_2
+	mov	[edi + TCP_Packet.Checksum], dx
+; At last send the packet!
+	DEBUGF 1,"Sending TCP Packet to device %x\n", ebx
+	mov	edx, [edi + TCP_Packet.SequenceNumber]
+	bswap	edx
+	mov	esi, [ebx + ETH_DEVICE.transmit]
+	pop	edi
+	jmp	TCP_queue
+  .fail:
+	add	esp, 2+4
+	or	eax, -1
+	ret
+;-----------------------------------------------------------------
+;
+;  Queue a TCP packet for sending
+;
+;  IN:  [esp] pointer to buffer
+;       [esp + 4] size of buffer
+;       ebx = driver struct
+;       esi = sender proc
+;       edx = sequence number of this packet in normal byte order
+;       edi = socket number
+;  OUT: /
+;
+;-----------------------------------------------------------------
+align 4
+TCP_queue:
+	bswap	edx
+	DEBUGF 1,"Adding packet to TCP queue, buffer: %x, size: %u, driver: %x, acknum: %u\n", [esp], [esp+4], ebx, edx
+	bswap	edx
+	cmp	[TCP_OUT_QUEUE], TCP_QUEUE_SIZE
+	jge	.full
+	mov	ecx, TCP_QUEUE_SIZE
+	mov	eax, TCP_OUT_QUEUE+4
+  .loop:
+	cmp	[eax + tcp_out_queue_entry.data_ptr], 0
+	je	.found_it
+	add	eax, tcp_out_queue_entry.size
+	loop	.loop
+  .full:			; silently discard the packet
+	DEBUGF 1,"TCP queue is full!\n"
+	call	kernel_free
-	xor	edx, edx
+	add	esp, 4
 align 4
 stateTCB_LISTEN:
-	DEBUGF	1,"TCBStateHandler: Listen\n"
+	DEBUGF	1,"TCBStateHandler: Listen\n"
-	; In this case, we are expecting a SYN Packet
-	; For now, if the Packet is a SYN, process it, and send a response
-	; If not, ignore it
 	; Look at control flags
-	test	[edx + TCP_Packet.Flags], TH_SYN
+	test	[edx + TCP_Packet.Flags], TH_SYN	; SYN packet? => send syn+ack, open new socket and set connection to established
 	jz	.exit
-	; Exit if backlog queue is full
+; Exit if backlog queue is full
 	mov	ax, [ebx + SOCKET_head.end + IPv4_SOCKET.end + TCP_SOCKET.backlog_cur]
 	cmp	ax, [ebx + SOCKET_head.end + IPv4_SOCKET.end + TCP_SOCKET.backlog]
 	jae	.exit
-	; Allocate new socket
+; Allocate new socket
-	push	esi
-	call	net_socket_alloc
+	push	esi edi
-	pop	esi
+	call	net_socket_alloc
 	test	eax, eax
-	jz	.exit
-	; Copy structure from current socket to new, including lock
+	jz	.fail
-	push	esi edi
+; Copy structure from current socket to new, including lock
-	lea	esi, [ebx + SOCKET_head.PID]	; yes, PID must also be copied
+	lea	esi, [ebx + SOCKET_head.PID]		; yes, PID must also be copied
 	lea	edi, [eax + SOCKET_head.PID]
 	mov	ecx, ((SOCKET_head.end - SOCKET_head.PID) + IPv4_SOCKET.end + TCP_SOCKET.end + 3)/4
 	rep	movsd
 	pop	edi esi
-	; Push pointer to new socket to queue
+; Push pointer to new socket to queue
 	movzx	ecx, [ebx + SOCKET_head.end + IPv4_SOCKET.end + TCP_SOCKET.backlog_cur]
-	inc	[ebx + SOCKET_head.end + IPv4_SOCKET.end + TCP_SOCKET.backlog_cur]
-	mov	[ebx + SOCKET_head.end + IPv4_SOCKET.end + TCP_SOCKET.end + ecx*4], eax
-	; We have a SYN. update the socket with this IP Packets details,
+	inc	[ebx + SOCKET_head.end + IPv4_SOCKET.end + TCP_SOCKET.backlog_cur]
-	; And send a response
+	mov	[ebx + SOCKET_head.end + IPv4_SOCKET.end + TCP_SOCKET.end + ecx*4], eax
 	mov	[eax + SOCKET_head.end + IPv4_SOCKET.RemoteIP], esi ; IP source address
 	mov	cx, [edx + TCP_Packet.SourcePort]
 	lea	esi, [eax + SOCKET_head.end + IPv4_SOCKET.end + TCP_SOCKET.RCV_NXT]
 	inc_INET esi ; RCV.NXT
 	mov	ecx, [eax + SOCKET_head.end + IPv4_SOCKET.end + TCP_SOCKET.ISS]
 	mov	[eax + SOCKET_head.end + IPv4_SOCKET.end + TCP_SOCKET.SND_NXT], ecx
 	mov	[eax + SOCKET_head.lock], 0
 	mov	[ebx + SOCKET_head.lock], 0
 	push	eax
+; Now construct the response
-	; Now construct the response
+	mov	bl, TH_SYN + TH_ACK
-	mov	bl, TH_SYN + TH_ACK
+	xor	ecx, ecx
+	call	TCP_send
-	call	TCP_send_ack
+	pop	eax
 	pop	eax
-	mov	[eax +	SOCKET_head.end + IPv4_SOCKET.end + TCP_SOCKET.state], TCB_SYN_RECEIVED
-	call	notify_network_event
-	; increment SND.NXT in socket
+	mov	[eax + SOCKET_head.lock], 0
-	lea	esi, [eax + SOCKET_head.end + IPv4_SOCKET.end + TCP_SOCKET.SND_NXT]
+	mov	[eax +	SOCKET_head.end + IPv4_SOCKET.end + TCP_SOCKET.state], TCB_SYN_RECEIVED
-	inc_INET esi
+	call	notify_network_event
 	ret
+  .exit:
+	mov	[ebx + SOCKET_head.lock], 0
+	ret
   .fail:
-  .exit:
+	add	esp, 8
 	mov	[ebx + SOCKET_head.lock], 0
 	ret
-align 4
-stateTCB_SYN_SENT:
-	DEBUGF	1,"TCBStateHandler: Syn_Sent\n"
+align 4
+stateTCB_SYN_SENT:
-	; We are awaiting an ACK to our SYN, with a SYM
+	DEBUGF	1,"TCBStateHandler: Syn_Sent\n"
-	; Look at control flags - expecting an ACK
-	mov	al, [edx + TCP_Packet.Flags]
-	and	al, TH_SYN + TH_ACK
-	cmp	al, TH_SYN + TH_ACK
-	je	.syn_ack
-	test	al, TH_SYN
+	; We are awaiting an ACK to our SYN, with a SYM
-	jz	.exit
+	; Look at control flags - expecting an ACK
-	mov	[ebx +	SOCKET_head.end + IPv4_SOCKET.end + TCP_SOCKET.state], TCB_SYN_RECEIVED
-	pushd	TH_SYN + TH_ACK
-	jmp	.send
-  .syn_ack:
+	mov	al, [edx + TCP_Packet.Flags]
-	mov	[ebx +	SOCKET_head.end + IPv4_SOCKET.end + TCP_SOCKET.state], TCB_ESTABLISHED
+	test	al, TH_RST
+	jnz	.reset			; jump if RST bit set
+	push	[edx + TCP_Packet.SequenceNumber]				     ;;
+	pop	[ebx + SOCKET_head.end + IPv4_SOCKET.end + TCP_SOCKET.RCV_NXT]	     ;;
+	inc_INET (ebx + SOCKET_head.end + IPv4_SOCKET.end + TCP_SOCKET.RCV_NXT)      ;;
-	pushd	TH_ACK
 	push	[edx + TCP_Packet.AckNumber]					    ;;;;;;
+	pop	[ebx + SOCKET_head.end + IPv4_SOCKET.end + TCP_SOCKET.SND_NXT]	    ;;;;;;
+	and	al, TH_SYN + TH_ACK
+	jz	.exit			; jump if none of the following is set: RST, SYN, ACK
   .send:
-	; Store the recv.nxt field
-	mov	eax, [edx + TCP_Packet.SequenceNumber]
+	test	al, TH_ACK
-	mov	[ebx +	SOCKET_head.end + IPv4_SOCKET.end + TCP_SOCKET.IRS], eax
+	jz     .onlysyn 		; jump if only SYN bit is set
 	bswap	eax
+	; If we arrived here, SYN and ACK are set
+	mov	[ebx +	SOCKET_head.end + IPv4_SOCKET.end + TCP_SOCKET.state], TCB_ESTABLISHED
+	pushw	TH_ACK
+  .send:	; Send an ACK
+	mov	eax, ebx
+	pop	bx
+	push	eax
+	xor	ecx, ecx
+	call	TCP_send
+	pop	ebx
+  .exit:
-	inc	eax
+	mov	[ebx + SOCKET_head.lock], 0
-	bswap	eax
+	ret
 	mov	[ebx +	SOCKET_head.end + IPv4_SOCKET.end + TCP_SOCKET.RCV_NXT], eax	      ; Update our recv.nxt field
-	mov	[ebx + SOCKET_head.lock], 0
-	lea	esi, [ebx +  SOCKET_head.end + IPv4_SOCKET.end + TCP_SOCKET.SND_NXT]
-	inc_INET esi
+  .reset:
-	; Send an ACK
+	; TODO: ....
-	mov	eax, ebx
-	pop	ebx
+	; remove all queued TCP packets for this connection !
-	call	TCP_send_ack
+	mov	[ebx + SOCKET_head.end + IPv4_SOCKET.end + TCP_SOCKET.state], TCB_CLOSED
-  .exit:
+	mov	[ebx + SOCKET_head.lock], 0
-	mov	[ebx + SOCKET_head.lock], 0
+	ret
 	ret
+  .onlysyn:
 	mov	[ebx + SOCKET_head.end + IPv4_SOCKET.end + TCP_SOCKET.state], TCB_SYN_RECEIVED
-align 4
+	pushw	TH_SYN + TH_ACK
-stateTCB_SYN_RECEIVED:
+	jmp	.send
-align 4
-stateTCB_ESTABLISHED:
+align 4
 stateTCB_ESTABLISHED:
+	DEBUGF	1,"TCBStateHandler: Established\n"
 	mov	eax, [ebx + SOCKET_head.end + IPv4_SOCKET.end + TCP_SOCKET.RCV_NXT]
-	DEBUGF	1,"TCBStateHandler: Established\n"
+	bswap	eax
+	DEBUGF	1,"RCV_NXT is set to:%u\n", eax
+	bswap	eax
+	cmp	eax, [edx + TCP_Packet.SequenceNumber]
+	jne	.exit
-	mov	eax, [ebx + SOCKET_head.end + IPv4_SOCKET.end + TCP_SOCKET.RCV_NXT]
+; Calculate next sequencenumber
-	cmp	eax, [edx + TCP_Packet.SequenceNumber]
-	jne	.exit
+	test	ecx, ecx
+	jnz	@f
-	; Here we are expecting data, or a request to close
-	; OR both...
-	; Did we receive a FIN or RST?
-	test	[edx + TCP_Packet.Flags], TH_FIN
-	jz	.check_ack
 	inc	ecx
-	; It was a fin or reset.
        @@:
-;;; TODO: write following code:
+	add_INET (ebx + SOCKET_head.end + IPv4_SOCKET.end + TCP_SOCKET.RCV_NXT)
 	; Remove resend entries from the queue  - I dont want to send any more data
-	; Send an ACK to that fin, and enter closewait state
 	test	[edx + TCP_Packet.Flags], TH_FIN
-  .check_ack:
+	jnz	.fin
 	; Check that we received an ACK
-	test	[edx + TCP_Packet.Flags], TH_ACK
+  .check_ack:
-	jz	.exit
+	test	[edx + TCP_Packet.Flags], TH_ACK
 	ja	@f
 	mov	[ebx + SOCKET_head.end + IPv4_SOCKET.end + TCP_SOCKET.wndsizeTimer], 1
       @@:
 	pop	ecx
 ; Now, see if we received any data
-	test	ecx, ecx
-	jnz	.data			   ; Read data, if any
-	lea	esi, [ebx +  SOCKET_head.end + IPv4_SOCKET.end + TCP_SOCKET.SND_NXT]
+	test	ecx, ecx
+	jz	.ack
-	inc_INET esi
+	DEBUGF	1,"Got %u bytes data!\n", ecx
-	; If we had received a fin, we need to ACK it.
+; calculate header length
-	cmp	[ebx + SOCKET_head.end + IPv4_SOCKET.end + TCP_SOCKET.state], TCB_CLOSE_WAIT
+	movzx	eax, [edx + TCP_Packet.DataOffset]
-	je	.ack
+	and	eax, 11110000b
-	jmp	.exit
+	shr	eax, 2
+       DEBUGF 1,"TCP header size: %u\n", eax
-  .data:
-	     ;;;
+	add	edx, eax
-	lea	esi, [ebx +  SOCKET_head.end + IPv4_SOCKET.end + TCP_SOCKET.SND_NXT]
-	add_INET esi
+	add	esp, 4
-	DEBUGF	1,"Got data!\n"
+	pop	esi
-	mov	esi, [esp + 4]
+	add	esp, 4
 	sub	edx, esi
 	mov	edi, edx
 	mov	eax, ebx
-	call	socket_internal_receiver
-  .ack:
+	jmp	socket_internal_receiver	; Place the data from packet into socket
 	mov	[ebx + SOCKET_head.lock], 0
+  .ack:
+	mov	eax, ebx
-	; Send an ACK
+	mov	bl, TH_ACK
+	push	eax
-	mov	eax, ebx
+	xor	ecx, ecx
-	mov	bl, TH_ACK
-	call	TCP_send_ack
+	call	TCP_send		    ; send the ack
-  .exit:
+	pop	ebx
+  .exit:
+	mov	[ebx + SOCKET_head.lock], 0
+	ret
+  .fin:
+; Remove all resend entries from the queue
+	mov	ecx, TCP_QUEUE_SIZE
+	mov	esi, TCP_OUT_QUEUE+4
+  .removeloop:
+	cmp	[esi + tcp_out_queue_entry.data_ptr], 0
+	je	.maybe_next
+	; TODO: check if the packets belong to the same tcp connection !
+       DEBUGF 1,"Removing a queued packet\n"
+	push	[esi + tcp_out_queue_entry.data_ptr]
+	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
+	loop	.removeloop
 ; Send an ACK to that fin, and enter closewait state
-	mov	[ebx + SOCKET_head.lock], 0
+	mov	[ebx + SOCKET_head.end + IPv4_SOCKET.end + TCP_SOCKET.state], TCB_CLOSE_WAIT
     @@: mov	[ebx + SOCKET_head.end + IPv4_SOCKET.end + TCP_SOCKET.state], TCB_CLOSING
 	cmp	al, TH_FIN
 	je	@f
 	mov	[ebx + SOCKET_head.end + IPv4_SOCKET.end + TCP_SOCKET.state], TCB_TIMED_WAIT
+    @@:
-    @@: lea	esi, [ebx + SOCKET_head.end + IPv4_SOCKET.end + TCP_SOCKET.RCV_NXT]
+;        lea     esi, [ebx + SOCKET_head.end + IPv4_SOCKET.end + TCP_SOCKET.RCV_NXT]
-	inc_INET esi
 ;        inc_INET esi
 	mov	[ebx + SOCKET_head.lock], 0
 	; Send an ACK
+	mov	eax, ebx
+	mov	bl, TH_ACK
-	mov	eax, ebx
+	push	eax
+	xor	ecx, ecx
-	mov	bl, TH_ACK
+	call	TCP_send
-	call	TCP_send_ack
+	pop	ebx
 	mov	[ebx + SOCKET_head.lock], 0
 	; Send an ACK
 	mov	eax, ebx
+	mov	bl, TH_ACK
+	push	eax
-	mov	bl, TH_ACK
+	xor	ecx, ecx
+	call	TCP_send
-	call	TCP_send_ack
+	pop	ebx
   .exit:

Subversion Repositories Kolibri OS

(root)/kernel/branches/net/network/tcp.inc @ 1318 – Rev 1257 → 1274