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

 ;;          GNU GENERAL PUBLIC LICENSE                             ;;
 ;;             Version 2, June 1991                                ;;
 ;;                                                                 ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-$Revision: 1830 $
+$Revision: 1831 $
 ;-----------------------------------------------------------------
+;
 	ntohw	[edx + TCP_segment.UrgentPointer]
 	ntohw	[edx + TCP_segment.SourcePort]
 	ntohw	[edx + TCP_segment.DestinationPort]
 ;------------------------------------------------------------
-; Next thing to do is find the TCB (thus, the socket pointer)
+; Next thing to do is find the TCPS (thus, the socket pointer)
 ; IP Packet TCP Destination Port = local Port
 ; ebx now contains the pointer to the socket
 ;----------------------------
 ; Check if socket isnt closed
-	cmp	[ebx + TCP_SOCKET.t_state], TCB_CLOSED
+	cmp	[ebx + TCP_SOCKET.t_state], TCPS_CLOSED
 	je	.drop_not_locked
 	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
+	mov	[eax + TCP_SOCKET.t_state], TCPS_LISTEN
 	cmp	esi, 20 			; esi is headersize
 	je	.no_options
 	DEBUGF	1,"Segment has options\n"
-	cmp	[ebx + TCP_SOCKET.t_state], TCB_LISTEN		; no options when in listen state
+	cmp	[ebx + TCP_SOCKET.t_state], TCPS_LISTEN 	 ; no options when in listen state
 	jz	.not_uni_xfer					; also no header prediction
 ;      In this case we'll free the ACK'ed data and notify higher levels that we have free space in buffer
+;
 ;  -  If the length is not 0 and the ACK didn't move, we're the receiver side of the transfer.
 ;      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
+	cmp	[ebx + TCP_SOCKET.t_state], TCPS_ESTABLISHED
 	jnz	.not_uni_xfer
 ; Calculate receive window size
 ;;;; TODO: 444
-	cmp	[ebx + TCP_SOCKET.t_state], TCB_LISTEN
+	cmp	[ebx + TCP_SOCKET.t_state], TCPS_LISTEN
 	je	.LISTEN
 	pop	[eax + TCP_SOCKET.SND_NXT]
 	TCP_sendseqinit eax
 	TCP_rcvseqinit eax
-	mov	[eax + TCP_SOCKET.t_state], TCB_SYN_RECEIVED
+	mov	[eax + TCP_SOCKET.t_state], TCPS_SYN_RECEIVED
 	mov	[eax + TCP_SOCKET.t_flags], TF_ACKNOW
 	mov	[eax + TCP_SOCKET.timer_keepalive], TCP_time_keep_interval  ;;;; macro
 ; set socket state to connected
 	mov	[ebx + SOCKET.state],1	;;;; FIXME
-	mov	[ebx + TCP_SOCKET.t_state], TCB_ESTABLISHED
+	mov	[ebx + TCP_SOCKET.t_state], TCPS_ESTABLISHED
 ;;; TODO: check if we should scale the connection (567-572)
 ;;; TODO: update RTT estimators
 ; Handle data that arrives after process terminates
 	cmp	[ebx + SOCKET.PID], 0
 	jg	@f
-	cmp	[ebx + TCP_SOCKET.t_state], TCB_CLOSE_WAIT
+	cmp	[ebx + TCP_SOCKET.t_state], TCPS_CLOSE_WAIT
 	jle	@f
 	mov	eax, [ebx + TCP_SOCKET.t_state]
 	shl	eax, 2
 	jmp	dword [eax + .rst_sw_list]
   .rst_sw_list:
-	dd	.rst_skip	;TCB_CLOSED
+	dd	.rst_skip	;TCPS_CLOSED
-	dd	.rst_skip	;TCB_LISTEN
+	dd	.rst_skip	;TCPS_LISTEN
-	dd	.rst_skip	;TCB_SYN_SENT
+	dd	.rst_skip	;TCPS_SYN_SENT
-	dd	.econnrefused	;TCB_SYN_RECEIVED
+	dd	.econnrefused	;TCPS_SYN_RECEIVED
-	dd	.econnreset	;TCB_ESTABLISHED
+	dd	.econnreset	;TCPS_ESTABLISHED
-	dd	.econnreset	;TCB_CLOSE_WAIT
+	dd	.econnreset	;TCPS_CLOSE_WAIT
-	dd	.econnreset	;TCB_FIN_WAIT_1
+	dd	.econnreset	;TCPS_FIN_WAIT_1
-	dd	.rst_close	;TCB_CLOSING
+	dd	.rst_close	;TCPS_CLOSING
-	dd	.rst_close	;TCB_LAST_ACK
+	dd	.rst_close	;TCPS_LAST_ACK
-	dd	.econnreset	;TCB_FIN_WAIT_2
+	dd	.econnreset	;TCPS_FIN_WAIT_2
-	dd	.rst_close	;TCB_TIMED_WAIT
+	dd	.rst_close	;TCPS_TIMED_WAIT
   .econnrefused:
+  .econnrefused:
-	DEBUGF	1,"Connection refused"
 	DEBUGF	1,"Connection refused"
 ;;; TODO: debug info
-	jmp	.close
+	mov	[ebx + SOCKET.errorcode], ECONNREFUSED
+	jmp	.close
   .econnreset:
-	DEBUGF	1,"Connection reset"
+  .econnreset:
+	DEBUGF	1,"Connection reset"
+	mov	[ebx + SOCKET.errorcode], ECONNRESET
+    .close:
-;;; TODO: debug info
+	DEBUGF	1,"Closing connection"
   .close:
+	mov	[ebx + TCP_SOCKET.t_state], TCPS_CLOSED
+	;;; TODO: update stats
-	DEBUGF	1,"Closing connection"
 	mov	eax, ebx
 ; handle SYN-full and ACK-less segments
 	test	[edx + TCP_segment.Flags], TH_SYN
+	jz	@f
 	jz	@f
 	mov	eax, ebx
-	mov	ebx, ECONNRESET
-	call	TCP_drop
+	mov	ebx, ECONNRESET
 	call	TCP_drop
 	jmp	.drop_with_reset
 ;---------------
 ; ACK processing
+	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]
+	cmp	eax, [ebx + TCP_SOCKET.SND_UNA]
+	jg	.drop_with_reset
+	cmp	[ebx + TCP_SOCKET.SND_MAX], eax
+	jg	.drop_with_reset
+	;;; update stats
+	mov	eax, ebx
+	call	SOCKET_is_connected
+	mov	[ebx + TCP_SOCKET.t_state], TCPS_ESTABLISHED
+; Do window scaling?
-	cmp	[ebx + TCP_SOCKET.t_state], TCB_SYN_RECEIVED
+	test	[ebx + TCP_SOCKET.t_flags], TF_RCVD_SCALE
+	jz	@f
+	test	[ebx + TCP_SOCKET.t_flags], TF_REQ_SCALE
+	jz	@f
+	;;; 810-811
+       @@:
+	;;; 813 ?
 	jnz	.no_syn_rcv
 	mov	eax, [edx + TCP_segment.SequenceNumber]
 ; Wake up process waiting on send buffer
 	mov	eax, ebx
 	call	SOCKET_notify_owner
-; Update TCB
+; Update TCPS
 	mov	eax, [ebx + TCP_SOCKET.t_state]
 	jmp	dword [eax*4 + .ACK_sw_list]
   .ACK_sw_list:
-	dd	.ack_processed	;TCB_CLOSED
+	dd	.ack_processed	;TCPS_CLOSED
-	dd	.ack_processed	;TCB_LISTEN
+	dd	.ack_processed	;TCPS_LISTEN
-	dd	.ack_processed	;TCB_SYN_SENT
+	dd	.ack_processed	;TCPS_SYN_SENT
-	dd	.ack_processed	;TCB_SYN_RECEIVED
+	dd	.ack_processed	;TCPS_SYN_RECEIVED
-	dd	.ack_processed	;TCB_ESTABLISHED
+	dd	.ack_processed	;TCPS_ESTABLISHED
-	dd	.ack_processed	;TCB_CLOSE_WAIT
+	dd	.ack_processed	;TCPS_CLOSE_WAIT
-	dd	.ack_fw1	;TCB_FIN_WAIT_1
+	dd	.ack_fw1	;TCPS_FIN_WAIT_1
-	dd	.ack_c		;TCB_CLOSING
+	dd	.ack_c		;TCPS_CLOSING
-	dd	.ack_la 	;TCB_LAST_ACK
+	dd	.ack_la 	;TCPS_LAST_ACK
-	dd	.ack_processed	;TCB_FIN_WAIT_2
+	dd	.ack_processed	;TCPS_FIN_WAIT_2
-	dd	.ack_tw 	;TCB_TIMED_WAIT
+	dd	.ack_tw 	;TCPS_TIMED_WAIT
 	mov	eax, ebx
 	call	SOCKET_is_disconnected
 ;;;        mov     [ebx + TCP_SOCKET.timer_timed_wait], TCP_time_max_idle
        @@:
-	mov	[ebx + TCP_SOCKET.t_state], TCB_FIN_WAIT_2
+	mov	[ebx + TCP_SOCKET.t_state], TCPS_FIN_WAIT_2
 	jmp	.ack_processed
   .ack_c:
 	jz	.ack_processed
-	mov	[ebx + TCP_SOCKET.t_state], TCB_TIMED_WAIT
+	mov	[ebx + TCP_SOCKET.t_state], TCPS_TIMED_WAIT
 	mov	eax, ebx
 	jz	.not_urgent
 	cmp	[edx + TCP_segment.UrgentPointer], 0
 	jz	.not_urgent
-	cmp	[ebx + TCP_SOCKET.t_state], TCB_TIMED_WAIT
+	cmp	[ebx + TCP_SOCKET.t_state], TCPS_TIMED_WAIT
 	je	.not_urgent
 	DEBUGF	1,"TCP: do data (%u)\n", ecx
 	test	[edx + TCP_segment.Flags], TH_FIN
 	jnz	.process_fin
-	cmp	[ebx + TCP_SOCKET.t_state], TCB_FIN_WAIT_1
+	cmp	[ebx + TCP_SOCKET.t_state], TCPS_FIN_WAIT_1
 	jge	.dont_do_data
   .process_fin:
 	DEBUGF	1,"Processing FIN\n"
-	cmp	[ebx + TCP_SOCKET.t_state], TCB_CLOSE_WAIT
+	cmp	[ebx + TCP_SOCKET.t_state], TCPS_CLOSE_WAIT
 	je	.not_first_fin
-	cmp	[ebx + TCP_SOCKET.t_state], TCB_CLOSING
+	cmp	[ebx + TCP_SOCKET.t_state], TCPS_CLOSING
 	je	.not_first_fin
-	cmp	[ebx + TCP_SOCKET.t_state], TCB_FIN_WAIT_2
+	cmp	[ebx + TCP_SOCKET.t_state], TCPS_FIN_WAIT_2
 	mov	eax, [ebx + TCP_SOCKET.t_state]
 	shl	eax, 2
 	jmp	dword [eax + .FIN_sw_list]
   .FIN_sw_list:
-	dd	.no_fin 	;TCB_CLOSED
+	dd	.no_fin 	;TCPS_CLOSED
-	dd	.no_fin 	;TCB_LISTEN
+	dd	.no_fin 	;TCPS_LISTEN
-	dd	.no_fin 	;TCB_SYN_SENT
+	dd	.no_fin 	;TCPS_SYN_SENT
-	dd	.fin_syn_est	;TCB_SYN_RECEIVED
+	dd	.fin_syn_est	;TCPS_SYN_RECEIVED
-	dd	.fin_syn_est	;TCB_ESTABLISHED
+	dd	.fin_syn_est	;TCPS_ESTABLISHED
-	dd	.no_fin 	;TCB_CLOSE_WAIT
+	dd	.no_fin 	;TCPS_CLOSE_WAIT
-	dd	.fin_wait1	;TCB_FIN_WAIT_1
+	dd	.fin_wait1	;TCPS_FIN_WAIT_1
-	dd	.no_fin 	;TCB_CLOSING
+	dd	.no_fin 	;TCPS_CLOSING
-	dd	.no_fin 	;TCB_LAST_ACK
+	dd	.no_fin 	;TCPS_LAST_ACK
-	dd	.fin_wait2	;TCB_FIN_WAIT_2
+	dd	.fin_wait2	;TCPS_FIN_WAIT_2
-	dd	.fin_timed	;TCB_TIMED_WAIT
+	dd	.fin_timed	;TCPS_TIMED_WAIT
   .fin_syn_est:
-	mov	[ebx + TCP_SOCKET.t_state], TCB_CLOSE_WAIT
+	mov	[ebx + TCP_SOCKET.t_state], TCPS_CLOSE_WAIT
 	jmp	.no_fin
   .fin_wait1:
-	mov	[ebx + TCP_SOCKET.t_state], TCB_CLOSING
+	mov	[ebx + TCP_SOCKET.t_state], TCPS_CLOSING
 	jmp	.no_fin
   .fin_wait2:

Subversion Repositories Kolibri OS

(root)/kernel/branches/net/network/tcp_input.inc @ 1831 – Rev 1830 → 1831