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

 ;;          GNU GENERAL PUBLIC LICENSE                             ;;
 ;;             Version 2, June 1991                                ;;
 ;;                                                                 ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-$Revision: 2301 $
+$Revision: 2305 $
 ;-----------------------------------------------------------------
+;
 TCP_input:
        DEBUGF  1,"TCP_input size=%u ", ecx
 ; Offset must be greater than or equal to the size of the standard TCP header (20) and less than or equal to the TCP length.
-	movzx	eax, [edx + TCP_segment.DataOffset]
+	movzx	eax, [edx + TCP_header.DataOffset]
 	and	eax, 0xf0
 	shr	al, 2
 	DEBUGF	1,"headersize=%u\n", eax
-	cmp	eax, TCP_segment.DataOffset
+	cmp	eax, TCP_header.DataOffset
 	jb	.drop_not_locked
 ;-------------------------------
 ; Now, re-calculate the checksum
 	push	eax ecx edx
-	pushw	[edx + TCP_segment.Checksum]
+	pushw	[edx + TCP_header.Checksum]
 	DEBUGF	1,"we got %u bytes of data\n", ecx
 ;-----------------------------------------------------------------------------------------
 ; Check if this packet has a timestamp option (We do it here so we can process it quickly)
-	cmp	esi, TCP_segment.DataOffset + 12		; Timestamp option is 12 bytes
+	cmp	esi, TCP_header.DataOffset + 12 	       ; Timestamp option is 12 bytes
 	jb	.no_timestamp
 	je	.is_ok
-	cmp	byte [edx + TCP_segment.Data + 12], TCP_OPT_EOL ; end of option list
+	cmp	byte [edx + sizeof.TCP_header + 12], TCP_OPT_EOL ; end of option list
 	jne	.no_timestamp
   .is_ok:
-	test	[edx + TCP_segment.Flags], TH_SYN		; SYN flag must not be set
+	test	[edx + TCP_header.Flags], TH_SYN	       ; SYN flag must not be set
 	jnz	.no_timestamp
   .no_timestamp:
 ;-------------------------------------------
 ; Convert Big-endian values to little endian
-	ntohd	[edx + TCP_segment.SequenceNumber]
+	ntohd	[edx + TCP_header.SequenceNumber]
-	ntohd	[edx + TCP_segment.AckNumber]
+	ntohd	[edx + TCP_header.AckNumber]
-	ntohw	[edx + TCP_segment.Window]
+	ntohw	[edx + TCP_header.Window]
-	ntohw	[edx + TCP_segment.UrgentPointer]
+	ntohw	[edx + TCP_header.UrgentPointer]
-	ntohw	[edx + TCP_segment.SourcePort]
+	ntohw	[edx + TCP_header.SourcePort]
-	ntohw	[edx + TCP_segment.DestinationPort]
+	ntohw	[edx + TCP_header.DestinationPort]
 	jne	.socket_loop
 	cmp	[ebx + SOCKET.Protocol], IP_PROTO_TCP
 	jne	.socket_loop
-	mov	ax, [edx + TCP_segment.DestinationPort]
+	mov	ax, [edx + TCP_header.DestinationPort]
 	cmp	[ebx + TCP_SOCKET.LocalPort], ax
 	jne	.socket_loop
 	test	eax, eax
 	jnz	.socket_loop
        @@:
 	mov	ax, [ebx + TCP_SOCKET.RemotePort]
-	cmp	[edx + TCP_segment.SourcePort] , ax
+	cmp	[edx + TCP_header.SourcePort] , ax
 	je	.found_socket
 	test	ax, ax
 	jnz	.socket_loop
   .found_socket:
 	DEBUGF	1,"Socket locked\n"
 ;---------------------------------------
 ; unscale the window into a 32 bit value
-	movzx	eax, [edx + TCP_segment.Window]
+	movzx	eax, [edx + TCP_header.Window]
 	push	ecx
 	mov	cl, [ebx + TCP_SOCKET.SND_SCALE]
 	shl	eax, cl
-	mov	dword [edx + TCP_segment.Window], eax	; word after window is checksum, we dont need checksum anymore
+	mov	dword [edx + TCP_header.Window], eax   ; word after window is checksum, we dont need checksum anymore
 	pop	ecx
 	call	SOCKET_fork
 	test	eax, eax
 	jz	.drop
-	push	[edx - IPv4_Packet.DataOrOptional + IPv4_Packet.DestinationAddress]	;;; FIXME
+	push	[edx - sizeof.IPv4_header + IPv4_header.DestinationAddress]	;;; FIXME
 	pop	[eax + IP_SOCKET.LocalIP]
-	push	[edx + TCP_segment.DestinationPort]
+	push	[edx + TCP_header.DestinationPort]
 	mov	[ebx + TCP_SOCKET.timer_keepalive], TCP_time_keep_interval
 ;--------------------
 ; Process TCP options
-	cmp	esi, TCP_segment.DataOffset		; esi is headersize
+	cmp	esi, TCP_header.DataOffset	       ; esi is headersize
 	je	.no_options
 	DEBUGF	1,"Segment has options\n"
 	cmp	[ebx + TCP_SOCKET.t_state], TCPS_LISTEN ; no options when in listen state
 	jz	.not_uni_xfer				; also no header prediction
   .opt_maxseg:
 	cmp	byte [edi+1], 4
 	jne	.no_options		; error occured, ignore all options!
-	test	[edx + TCP_segment.Flags], TH_SYN
+	test	[edx + TCP_header.Flags], TH_SYN
 	jz	@f
   .opt_window:
 	cmp	byte [edi+1], 3
 	jne	.no_options
-	test	[edx + TCP_segment.Flags], TH_SYN
+	test	[edx + TCP_header.Flags], TH_SYN
 	jz	@f
 ;      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], TCPS_ESTABLISHED
 	jnz	.not_uni_xfer
-	test	[edx + TCP_segment.Flags], TH_SYN + TH_FIN + TH_RST + TH_URG
+	test	[edx + TCP_header.Flags], TH_SYN + TH_FIN + TH_RST + TH_URG
 	jnz	.not_uni_xfer
-	test	[edx + TCP_segment.Flags], TH_ACK
+	test	[edx + TCP_header.Flags], TH_ACK
 	jz	.not_uni_xfer
-	mov	eax, [edx + TCP_segment.SequenceNumber]
+	mov	eax, [edx + TCP_header.SequenceNumber]
 	cmp	eax, [ebx + TCP_SOCKET.RCV_NXT]
 	jne	.not_uni_xfer
 	mov	eax, [ebx + TCP_SOCKET.SND_CWND]
 	cmp	eax, [ebx + TCP_SOCKET.SND_WND]
 	jb	.not_uni_xfer
 ; - The acknowledgment field in the segment is less than or equal to the maximum sequence number sent.
-	mov	eax, [edx + TCP_segment.AckNumber]
+	mov	eax, [edx + TCP_header.AckNumber]
 	cmp	eax, [ebx + TCP_SOCKET.SND_MAX]
 	ja	.not_uni_xfer
 	lea	eax, [ebx + STREAM_SOCKET.snd]
 	call	SOCKET_ring_free
 	popa
 ; update window pointers
-	mov	eax, [edx + TCP_segment.AckNumber]
+	mov	eax, [edx + TCP_header.AckNumber]
 	mov	[ebx + TCP_SOCKET.SND_UNA], eax
   .not_sender:
 ; - The amount of data in the segment is greater than 0 (data count is in ecx)
 ; - The acknowledgment field equals the largest unacknowledged sequence number. This means no data is acknowledged by this segment.
-	mov	eax, [edx + TCP_segment.AckNumber]
+	mov	eax, [edx + TCP_header.AckNumber]
 	cmp	eax, [ebx + TCP_SOCKET.SND_UNA]
 	DEBUGF	1,"Header prediction failed\n"
+; Calculate receive window size
+;        mov     eax, [ebx + STREAM_SOCKET.rcv + RING_BUFFER.size]
+;        neg     eax
+;        add     eax, SOCKETBUFFSIZE
+;        mov     edx, [ebx + TCP_SOCKET.RCV_ADV]
+;        sub     edx, [ebx + TCP_SOCKET.RCV_NXT]
+;        cmp     eax, edx
-; Calculate receive window size
+;        jae     @f
 ;        mov     eax, edx
-;;;; TODO: 444
+;       @@:
 align 4
 .LISTEN:
 	DEBUGF	1,"TCP state: listen\n"
-	test	[edx + TCP_segment.Flags], TH_RST	;;; TODO: kill new socket on error
+	test	[edx + TCP_header.Flags], TH_RST       ;;; TODO: kill new socket on error
 	jnz	.drop
-	test	[edx + TCP_segment.Flags], TH_ACK
+	test	[edx + TCP_header.Flags], TH_ACK
 	jnz	.drop_with_reset
-	test	[edx + TCP_segment.Flags], TH_SYN
+	test	[edx + TCP_header.Flags], TH_SYN
 	jz	.drop
 ;;; TODO: check if it's a broadcast or multicast, and drop if so
-	push	[edx - IPv4_Packet.DataOrOptional + IPv4_Packet.SourceAddress]	   ;;; FIXME
+	push	[edx - sizeof.IPv4_header + IPv4_header.SourceAddress]	   ;;; FIXME
 	pop	[ebx + IP_SOCKET.RemoteIP]
 align 4
 .SYN_SENT:
 	DEBUGF	1,"TCP state: syn_sent\n"
-	test	[edx + TCP_segment.Flags], TH_ACK
+	test	[edx + TCP_header.Flags], TH_ACK
 	jz	@f
-	mov	eax, [edx + TCP_segment.AckNumber]
+	mov	eax, [edx + TCP_header.AckNumber]
 	cmp	eax, [ebx + TCP_SOCKET.ISS]
 	jbe	.drop_with_reset
 	cmp	eax, [ebx + TCP_SOCKET.SND_MAX]
 	ja	.drop_with_reset
        @@:
-	test	[edx + TCP_segment.Flags], TH_RST
+	test	[edx + TCP_header.Flags], TH_RST
 	jz	@f
-	test	[edx + TCP_segment.Flags], TH_ACK
+	test	[edx + TCP_header.Flags], TH_ACK
 	jz	.drop
 	mov	eax, ebx
 	mov	ebx, ECONNREFUSED
 	call	TCP_drop
 	jmp	.drop
        @@:
-	test	[edx + TCP_segment.Flags], TH_SYN
+	test	[edx + TCP_header.Flags], TH_SYN
 	jz	.drop
 ; at this point, segment seems to be valid
-	test	[edx + TCP_segment.Flags], TH_ACK
+	test	[edx + TCP_header.Flags], TH_ACK
 	jz	.no_syn_ack
 ; now, process received SYN in response to an active open
-	mov	eax, [edx + TCP_segment.AckNumber]
+	mov	eax, [edx + TCP_header.AckNumber]
 	mov	[ebx + TCP_SOCKET.SND_UNA], eax
 	cmp	eax, [ebx + TCP_SOCKET.SND_NXT]
 	jbe	@f
 	mov	[ebx + TCP_SOCKET.SND_NXT], eax
        @@:
 ;-------------------------------------
 ; Common processing for receipt of SYN
   .trim_then_step6:
-	inc	[edx + TCP_segment.SequenceNumber]
+	inc	[edx + TCP_header.SequenceNumber]
 ;;; TODO: Drop any received data that follows receive window (590)
-	mov	eax, [edx + TCP_segment.SequenceNumber]
+	mov	eax, [edx + TCP_header.SequenceNumber]
 ; trim any data not in window
 ; check for duplicate data at beginning of segment
 	mov	eax, [ebx + TCP_SOCKET.RCV_NXT]
-	sub	eax, [edx + TCP_segment.SequenceNumber]
+	sub	eax, [edx + TCP_header.SequenceNumber]
 	jbe	.no_duplicate
 	DEBUGF	1,"Uh oh.. %u bytes of duplicate data!\n", eax
-	test	[edx + TCP_segment.Flags], TH_SYN
+	test	[edx + TCP_header.Flags], TH_SYN
 	jz	.no_dup_syn
 ; remove duplicate syn
-	and	[edx + TCP_segment.Flags], not (TH_SYN)
+	and	[edx + TCP_header.Flags], not (TH_SYN)
-	inc	[edx + TCP_segment.SequenceNumber]
+	inc	[edx + TCP_header.SequenceNumber]
-	cmp	[edx + TCP_segment.UrgentPointer], 1
+	cmp	[edx + TCP_header.UrgentPointer], 1
 	jbe	@f
-	dec	[edx + TCP_segment.UrgentPointer]
+	dec	[edx + TCP_header.UrgentPointer]
 ;;; TODO: apply figure 28.30
 ; Check for duplicate FIN
-	test	[edx + TCP_segment.Flags], TH_FIN
+	test	[edx + TCP_header.Flags], TH_FIN
 	jz	@f
 	inc	ecx
 	cmp	eax, ecx
 	dec	ecx
 	jne	@f
 	mov	eax, ecx
-	and	[edx + TCP_segment.Flags], not TH_FIN
+	and	[edx + TCP_header.Flags], not TH_FIN
 ; This code also handles simultaneous half-open or self-connects
 	test	eax, eax
 	jnz	.drop_after_ack
-	cmp	[edx + TCP_segment.Flags], TH_ACK
+	cmp	[edx + TCP_header.Flags], TH_ACK
 	jz	.drop_after_ack
   .no_duplicate:
 ;-----------------------------------------------
 ; Remove duplicate data and update urgent offset
-	add	[edx + TCP_segment.SequenceNumber], eax
+	add	[edx + TCP_header.SequenceNumber], eax
 ;;; TODO
-	sub	[edx + TCP_segment.UrgentPointer], ax
+	sub	[edx + TCP_header.UrgentPointer], ax
 	ja	@f
        @@:
 ;----------------------------------------
 ; Remove data beyond right edge of window
-	mov	eax, [edx + TCP_segment.SequenceNumber]
+	mov	eax, [edx + TCP_header.SequenceNumber]
 	add	eax, ecx
 	sub	eax, [ebx + TCP_SOCKET.RCV_NXT]
 ;------------------
 ; Process RST flags
-	test	[edx + TCP_segment.Flags], TH_RST
+	test	[edx + TCP_header.Flags], TH_RST
 ;--------------------------------------
 ; handle SYN-full and ACK-less segments
-	test	[edx + TCP_segment.Flags], TH_SYN
+	test	[edx + TCP_header.Flags], TH_SYN
 	jz	@f
 	mov	eax, ebx
 	mov	ebx, ECONNRESET
 	call	TCP_drop
 	cmp	[ebx + TCP_SOCKET.t_state], TCPS_SYN_RECEIVED
 	jnz	.no_syn_rcv
 	DEBUGF	1,"TCP state = syn received\n"
-	mov	eax, [edx + TCP_segment.AckNumber]
+	mov	eax, [edx + TCP_header.AckNumber]
 	cmp	[ebx + TCP_SOCKET.SND_UNA], eax
 	ja	.drop_with_reset
        @@:
 	;;; 813 ?
-	mov	eax, [edx + TCP_segment.SequenceNumber]
+	mov	eax, [edx + TCP_header.SequenceNumber]
 	dec	eax
 	mov	[ebx + TCP_SOCKET.SND_WL1], eax
 	jmp	.not_dup_ack
   .no_syn_rcv:
 ; check for duplicate ACK
-	mov	eax, [edx + TCP_segment.AckNumber]
+	mov	eax, [edx + TCP_header.AckNumber]
 	cmp	eax, [ebx + TCP_SOCKET.SND_UNA]
 	ja	.not_dup_ack
 	test	ecx, ecx
 	jnz	.reset_dupacks
-	mov	eax, dword [edx + TCP_segment.Window]
+	mov	eax, dword [edx + TCP_header.Window]
 	cmp	eax, [ebx + TCP_SOCKET.SND_WND]
 	jne	.reset_dupacks
 	pop	edx
 	mov	[ebx + TCP_SOCKET.SND_SSTHRESH], eax
 	mov	[ebx + TCP_SOCKET.timer_retransmission], 0	; turn off retransmission timer
 	mov	[ebx + TCP_SOCKET.t_rtt], 0
-	mov	eax, [edx + TCP_segment.AckNumber]
+	mov	eax, [edx + TCP_header.AckNumber]
 	mov	[ebx + TCP_SOCKET.SND_NXT], eax
 	mov	eax, [ebx + TCP_SOCKET.t_maxseg]
 	mov	[ebx + TCP_SOCKET.SND_CWND], eax
 	mov	[ebx + TCP_SOCKET.SND_CWND], eax
        @@:
 	mov	[ebx + TCP_SOCKET.t_dupacks], 0
-	mov	eax, [edx + TCP_segment.AckNumber]
+	mov	eax, [edx + TCP_header.AckNumber]
 	cmp	eax, [ebx + TCP_SOCKET.SND_MAX]
 	jbe	@f
 	;;; TODO: update stats
 	jmp	.drop_after_ack
 	;;;;; 912 - 926
 	mov	[ebx + TCP_SOCKET.timer_retransmission], 0
 	mov	eax, [ebx + TCP_SOCKET.SND_MAX]
-	cmp	eax, [edx + TCP_segment.AckNumber]
+	cmp	eax, [edx + TCP_header.AckNumber]
 	je	.all_outstanding
 	mov	eax, ebx
 	call	SOCKET_notify_owner
 ; Update TCPS
-	mov	eax, [edx + TCP_segment.AckNumber]
+	mov	eax, [edx + TCP_header.AckNumber]
 	mov	[ebx + TCP_SOCKET.SND_UNA], eax
 	DEBUGF	1,"ACK processed\n"
 ;----------------------------------------------
 ; check if we need to update window information
-	test	[edx + TCP_segment.Flags], TH_ACK
+	test	[edx + TCP_header.Flags], TH_ACK
 	jz	.no_window_update
 	mov	eax, [ebx + TCP_SOCKET.SND_WL1]
-	cmp	eax, [edx + TCP_segment.SequenceNumber]
+	cmp	eax, [edx + TCP_header.SequenceNumber]
 	jb	.update_window
 	ja	@f
 	mov	eax, [ebx + TCP_SOCKET.SND_WL2]
-	cmp	eax, [edx + TCP_segment.AckNumber]
+	cmp	eax, [edx + TCP_header.AckNumber]
 	jb	.update_window
 	ja	.no_window_update
        @@:
 	mov	eax, [ebx + TCP_SOCKET.SND_WL2]
-	cmp	eax, [edx + TCP_segment.AckNumber]
+	cmp	eax, [edx + TCP_header.AckNumber]
 ;        test    ecx, ecx
 ;        jz      @f
+;
 ;        mov     eax, [ebx + TCP_SOCKET.SND_WL2]
-;        cmp     eax, [edx + TCP_segment.AckNumber]
+;        cmp     eax, [edx + TCP_header.AckNumber]
 ;        jne     @f
+;
 ;        ;; mov eax, tiwin
 ;        cmp     eax, [ebx + TCP_SOCKET.SND_WND]
 ;        jbe     @f
+;
 ;        ;;; update stats
+;
 ;       @@:
-	mov	eax, dword [edx + TCP_segment.Window]
+	mov	eax, dword [edx + TCP_header.Window]
 	cmp	eax, [ebx + TCP_SOCKET.max_sndwnd]
 	jbe	@f
 	mov	[ebx + TCP_SOCKET.max_sndwnd], eax
        @@:
 	mov	[ebx + TCP_SOCKET.SND_WND], eax
-	push	[edx + TCP_segment.SequenceNumber]
+	push	[edx + TCP_header.SequenceNumber]
 	pop	[ebx + TCP_SOCKET.SND_WL1]
 ;-----------------
 ; process URG flag
-	test	[edx + TCP_segment.Flags], TH_URG
+	test	[edx + TCP_header.Flags], TH_URG
 	jz	.not_urgent
-	cmp	[edx + TCP_segment.UrgentPointer], 0
+	cmp	[edx + TCP_header.UrgentPointer], 0
 	jz	.not_urgent
 	cmp	[ebx + TCP_SOCKET.t_state], TCPS_TIMED_WAIT
 	je	.not_urgent
 ; Ignore bogus urgent offsets
 	;;; 1040-1050
-	movzx	eax, [edx + TCP_segment.UrgentPointer]
+	movzx	eax, [edx + TCP_header.UrgentPointer]
   .do_data:
 	DEBUGF	1,"TCP: do data (%u)\n", ecx
-	test	[edx + TCP_segment.Flags], TH_FIN
+	test	[edx + TCP_header.Flags], TH_FIN
 	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 ?
+	movzx	eax, [edx + TCP_header.DataOffset]	       ;;; todo: remember this in.. edi ?
 align 4
 .drop_after_ack:
 	DEBUGF	1,"Drop after ACK\n"
-	test	[edx + TCP_segment.Flags], TH_RST
+	test	[edx + TCP_header.Flags], TH_RST
 	jnz	.drop
 .drop_with_reset_not_locked:
 	DEBUGF	1,"Drop with reset\n"
-	test	[edx + TCP_segment.Flags], TH_RST
+	test	[edx + TCP_header.Flags], TH_RST
 	jnz	.drop
 	;;; if its a multicast/broadcast, also drop
-	test	[edx + TCP_segment.Flags], TH_ACK
+	test	[edx + TCP_header.Flags], TH_ACK
 	jnz	.respond_ack

Subversion Repositories Kolibri OS

(root)/kernel/branches/net/network/tcp_input.inc – Rev 2301 → 2305