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

 ;;          GNU GENERAL PUBLIC LICENSE                             ;;
 ;;             Version 2, June 1991                                ;;
 ;;                                                                 ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-$Revision: 1542 $
+$Revision: 1543 $
 ; Socket states
 TCB_CLOSED		equ 0
   .no_timestamp:
 ;-------------------------------------------
 ; Convert Big-endian values to little endian
-	ntohld	[edx + TCP_segment.SequenceNumber]
+	ntohd	[edx + TCP_segment.SequenceNumber]
-	ntohld	[edx + TCP_segment.AckNumber]
+	ntohd	[edx + TCP_segment.AckNumber]
-	ntohlw	[edx + TCP_segment.Window]
+	ntohw	[edx + TCP_segment.Window]
-	ntohlw	[edx + TCP_segment.UrgentPointer]
+	ntohw	[edx + TCP_segment.UrgentPointer]
-	ntohlw	[edx + TCP_segment.SourcePort]
+	ntohw	[edx + TCP_segment.SourcePort]
-	ntohlw	[edx + TCP_segment.DestinationPort]
+	ntohw	[edx + TCP_segment.DestinationPort]
   .socket_loop:
 	mov	ebx, [ebx + SOCKET.NextPtr]
 	or	ebx, ebx
 	jz	.drop_with_reset
+	cmp	[ebx + SOCKET.Domain], AF_INET4
+	jne	.socket_loop
-	cmp	[ebx + SOCKET.Protocol], IP_PROTO_TCP	  ;;; We should also check if family is AF_INET
+	cmp	[ebx + SOCKET.Protocol], IP_PROTO_TCP
 	jne	.socket_loop
 	mov	ax, [edx + TCP_segment.DestinationPort]
 	cmp	[ebx + TCP_SOCKET.LocalPort], ax
 	jne	.socket_loop
 	mov	eax, [ebx + IP_SOCKET.RemoteIP]
-	cmp	eax, edi			; sender IP
+	cmp	eax, edi			; edi is source ip from packet
 	je	@f
 ;;        call    wait_mutex
 ;;        sub     ebx, SOCKET.lock
 	DEBUGF	1,"Socket locked\n"
-;----------------------------------------------------------------------------------------
+;---------------------------------------
-; unscale the window into a 32 bit value (notice that SND_SCALE must be initialised to 0)
+; unscale the window into a 32 bit value
 	movzx	eax, [edx + TCP_segment.Window]
+	push	ecx
-	push	ecx
+	mov	cl, [ebx + TCP_SOCKET.SND_SCALE]
-	mov	cl, [ebx + TCP_SOCKET.SND_SCALE]
-	shl	eax, cl
-	pop	ecx
+	shl	eax, cl
 	mov	dword [edx + TCP_segment.Window], eax	; word after window is checksum, we dont need checksum anymore
-	;;;; do something with eax
+	pop	ecx
+;-----------------------------------
+; Is this socket a listening socket?
+	test	[ebx + SOCKET.options], SO_ACCEPTCON
+	jz	.no_listening_socket
+	call	SOCKET_fork
+	jz	.drop
+	push	[edx + TCP_segment.DestinationPort]
+	pop	[eax + TCP_SOCKET.LocalPort]
+	push	[edx - IPv4_Packet.DataOrOptional + IPv4_Packet.DestinationAddress]	;;; FIXME
+	pop	[eax + IP_SOCKET.LocalIP]
+	push	[edx - IPv4_Packet.DataOrOptional + IPv4_Packet.SourceAddress]	   ;;; FIXME
+	pop	[eax + IP_SOCKET.RemoteIP]
-;-----------------------------------
+	mov	[eax + TCP_SOCKET.t_state], TCB_LISTEN
 ; Is this socket a listening socket?
 	jmp	.not_uni_xfer
 	je	.no_options
 	DEBUGF	1,"Segment has options\n"
 	cmp	[ebx + TCP_SOCKET.t_state], TCB_LISTEN		; no options when in listen state
-	jz	.no_options
+	jz	.not_uni_xfer					; also no header prediction
 	mov	eax, [edx + TCP_segment.SequenceNumber]
 	cmp	eax, [ebx + TCP_SOCKET.RCV_NXT]
 	jne	.not_uni_xfer
-	movzx	eax, [edx + TCP_segment.Window] ;;;;; (should use pre-calculated value instead: todo: figure out where to store it)
+	mov	eax, dword [edx + TCP_segment.Window]
 	cmp	eax, [ebx + TCP_SOCKET.SND_WND]
 	jne	.not_uni_xfer
 align 4
 .LISTEN:
 	DEBUGF	1,"TCP state: listen\n"
-	test	[edx + TCP_segment.Flags], TH_RST
+	test	[edx + TCP_segment.Flags], TH_RST	;;; TODO: kill new socket on error
 	jnz	.drop
 	test	[edx + TCP_segment.Flags], TH_ACK
-	jnz	.drop_with_reset
-	test	[edx + TCP_segment.Flags], TH_SYN
+	jnz	.drop_with_reset
-	jz	.drop
-	cmp	esi, 0xffffff		; destination ip = 255.255.255.255 ?
 	jz	.drop
 	test	[edx + TCP_segment.Flags], TH_SYN
-	; TODO: check if it's a broadcast or multicast, and drop if so
+	jz	.drop
 	pop	[eax + TCP_SOCKET.IRS]
 	push	[eax + TCP_SOCKET.ISS]
+	pop	[eax + TCP_SOCKET.SND_NXT]
+	TCP_sendseqinit eax
-	pop	[eax + TCP_SOCKET.SND_NXT]
+	TCP_rcvseqinit eax
 	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  ;;;; macro
+	add	eax, STREAM_SOCKET.snd
+	call	SOCKET_ring_create
+	add	eax, STREAM_SOCKET.rcv - STREAM_SOCKET.snd
+	call	SOCKET_ring_create
-	mov	[eax + TCP_SOCKET.t_flags], TF_ACKNOW
+	sub	eax, STREAM_SOCKET.rcv
 	mov	[eax + TCP_SOCKET.timer_keepalive], TCP_time_keep_interval
 	mov	[eax + SOCKET.lock], 0
-	mov	ebx, eax
+	mov	ebx, eax	; if there is data, it must arrive in this new socket!
        @@:
 	;;;;;
 	jmp	.step6
   .trim_then_step6:
 	mov	[ebx + TCP_SOCKET.timer_retransmission], 0
 	mov	eax, [ebx + TCP_SOCKET.SND_MAX]
 	cmp	eax, [edx + TCP_segment.AckNumber]
 	je	.all_outstanding
-	mov	[ebx + TCP_SOCKET.timer_retransmission], 120 ;;;; TODO: correct this value
+	mov	[ebx + TCP_SOCKET.timer_retransmission], 120 ;;;; TODO: correct this value (use a macro for it)
   .all_outstanding:
 	cmp	eax, [edx + TCP_segment.AckNumber]
 	jl	.update_window
 	jg	.no_window_update
        @@:
-	mov	eax, [ebx + TCP_SOCKET.SND_WL2] 	  ;;;;
+	mov	eax, [ebx + TCP_SOCKET.SND_WL2]
 	cmp	eax, [edx + TCP_segment.AckNumber]
 	jne	.no_window_update
+;
 ;        ;;; update stats
+;
 ;       @@:
-	movzx	eax, [edx + TCP_segment.Window] 	;;; FIXME: use pre-calculated value instead!
+	mov	eax, dword [edx + TCP_segment.Window]
 	cmp	eax, [ebx + TCP_SOCKET.max_sndwnd]
 	jle	@f
 	mov	[ebx + TCP_SOCKET.max_sndwnd], eax
        @@:
 	shr	al, 2
 	lea	esi, [edx + eax]
 	or	[ebx + TCP_SOCKET.t_flags], TF_DELACK
-	add	[ebx + TCP_SOCKET.RCV_NXT], ecx 	 ;;; right ?
+	add	[ebx + TCP_SOCKET.RCV_NXT], ecx
 	inc	ecx
 	jmp	.no_persist_timeout
   .no_zero_window:
-	mov	[eax + TCP_SOCKET.timer_persist], 0	;;;;
+	mov	[eax + TCP_SOCKET.timer_persist], 0
 	mov	[eax + TCP_SOCKET.t_rxtshift], 0
 	or	dx, di	;        .Flags                  db ?
 	pushw	dx
 	shr	edi, 2	;        .DataOffset             db ? ;;;;
 	push	[eax + TCP_SOCKET.RCV_NXT]	;        .AckNumber              dd ?
-	ntohld	[esp]
+	ntohd	[esp]
 	push	[eax + TCP_SOCKET.SND_NXT]	;        .SequenceNumber         dd ?
-	ntohld	[esp]
+	ntohd	[esp]
 	push	[eax + TCP_SOCKET.RemotePort]	;        .DestinationPort        dw ?
-	ntohlw	[esp]
+	ntohw	[esp]
 	push	[eax + TCP_SOCKET.LocalPort]	;        .SourcePort             dw ?

Subversion Repositories Kolibri OS

(root)/kernel/branches/net/network/tcp.inc – Rev 1542 → 1543