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

 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;                                                              ;;
-;; Copyright (C) KolibriOS team 2004-2007. All rights reserved. ;;
+;; Copyright (C) KolibriOS team 2004-2008. All rights reserved. ;;
 ;; Distributed under terms of the GNU General Public License    ;;
 ;;                                                              ;;
 ;;  TCP.INC                                                     ;;
 ;;                                                              ;;
 ;;  TCP Processes for Menuet OS  TCP/IP stack                   ;;
 ;;                                                              ;;
-;;  Version 0.6  4th July 2004                                  ;;
-;;                                                              ;;
 ;;  Copyright 2002 Mike Hibbett, mikeh@oceanfree.net            ;;
 ;;                                                              ;;
 ;;  See file COPYING for details                                ;;
 ;;  v0.6 : Added reset handling in the established state        ;;
 ;;         Added a timer per socket to allow delays when        ;;
 ;;         rx window gets below 1KB                             ;;
 ;;                                                              ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-$Revision: 914 $
+$Revision: 2971 $
 	mov	ebx, net_sockets
 	cmp	[ebx + SOCKET.NextPtr], 0
 	je	.exit
-	DEBUGF	1, "K : sockets:\n"
+	;DEBUGF	1, "K : sockets:\n"
   .next_socket:
 	mov	ebx, [ebx + SOCKET.NextPtr]
 	or	ebx, ebx
 	jz	.exit
-	DEBUGF	1, "K :   %x: %x-%x-%x-%u\n", ebx, [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.TCBState]
     mov     ecx, 0
   .next_resendq:
     cmp     ecx, NUMRESENDENTRIES
-	je	.exit		    ; None left
-	;cmp     [esi], byte 0xFF                                    ; XTODO: 0xff -> 0
+	je	.exit		    ; None left
 	cmp	dword[esi + 4], 0
 	jne	@f		     ; found one
     inc     ecx
 	add	esi, 8
     inc     ecx
 	add	esi, 8
 	jmp	.next_resendq	    ; Timer not zero, so move on
-    @@:
-	;mov     bl, 0xff                                             ; XTODO: bl -> ebx, 0xff -> 0
+    @@:
 	xor	ebx, ebx
     ; restart timer, and decrement retries
     ; After the first resend, back of on next, by a factor of 5
 	mov	[esi + 2], word TCP_TIMEOUT * 5
 	dec	byte[esi + 1]
 	jnz	@f
     ; retries now 0, so delete from queue
-	;xchg     [esi], bl                                          ; XTODO: bl -> ebx
+    ; retries now 0, so delete from queue
 	xchg	 [esi + 4], ebx
     call    dequeue
     cmp     ax, NO_BUFFER
 	jne	.tth004z
-    ; TODO - try again in 10ms.
-	;cmp     bl, 0xff                                            ; XTODO: 0xff -> 0
+    ; TODO - try again in 10ms.
 	test	ebx, ebx
-	jnz	@f
-	;mov     [esi], bl                                            ; XTODO: bl -> ebx
+	jnz	@f
 	mov	[esi + 4], ebx
     @@: ; Mark it to expire in 10ms - 1 tick
   .next_socket.1:
 	mov	ebx, [ebx + SOCKET.NextPtr]
 	or	ebx, ebx
 	jz	.next_socket.1.exit
-	cmp	[ebx + SOCKET.Status], SOCK_OPEN
-	jne	.next_socket.1
 ;        DEBUGF  1, "K : tcp_rx - 1.dport: %x - %x\n", [edx + 20 + TCP_PACKET.DestinationPort]:4, [ebx + SOCKET.LocalPort]:4
 	mov	ax, [edx + 20 + TCP_PACKET.DestinationPort]  ; get the dest. port from the TCP hdr
   .next_socket.2:
 	mov	ebx, [ebx + SOCKET.NextPtr]
 	or	ebx, ebx
 	jz	.next_socket.2.exit
-	cmp	[ebx + SOCKET.Status], SOCK_OPEN
-	jne	.next_socket.2
 ;        DEBUGF  1, "K : tcp_rx - 2.dport: %x - %x\n", [edx + 20 + TCP_PACKET.DestinationPort]:4, [ebx + SOCKET.LocalPort]:4
 	mov	ax, [edx + 20 + TCP_PACKET.DestinationPort]  ; get the dest. port from the TCP hdr
   .next_socket.3:
 	mov	ebx, [ebx + SOCKET.NextPtr]
 	or	ebx, ebx
 	jz	.next_socket.3.exit
-	cmp	[ebx + SOCKET.Status], SOCK_OPEN
-	jne	.next_socket.3
 ;        DEBUGF  1, "K : tcp_rx - 3.dport: %x - %x\n", [edx + 20 + TCP_PACKET.DestinationPort]:4, [ebx + SOCKET.LocalPort]:4
 	mov	ax, [edx + 20 + TCP_PACKET.DestinationPort]  ; get destination port from the TCP hdr
     ; If we got here, we need to reject the packet
-	DEBUGF	1, "K : tcp_rx - dumped\n"
-	DEBUGF	1, "K :   --------: %x-%x-%x (flags: %x)\n", [edx + 20 + TCP_PACKET.DestinationPort]:4, [edx + IP_PACKET.SourceAddress], [edx + 20 + TCP_PACKET.SourcePort]:4, [edx + 20 + TCP_PACKET.Flags]:2
+	DEBUGF	1, "K : tcp_rx - dumped\n"
-;       mov     ebx, net_sockets
-;
-; .next_socket.4:
-;       mov     ebx, [ebx + SOCKET.NextPtr]
-;       or      ebx, ebx
-;       jz      .next_socket.4.exit
-;       DEBUGF  1, "K :   %x: %x-%x-%x-%u\n", ebx, [ebx + SOCKET.LocalPort]:4, [ebx + SOCKET.RemoteIP], [ebx + SOCKET.RemotePort]:4, [ebx + SOCKET.TCBState]
-;       jne     .next_socket.4
 	DEBUGF	1, "K :   --------: %x-%x-%x (flags: %x)\n", [edx + 20 + TCP_PACKET.DestinationPort]:4, [edx + IP_PACKET.SourceAddress], [edx + 20 + TCP_PACKET.SourcePort]:4, [edx + 20 + TCP_PACKET.Flags]:2
 ; .next_socket.4.exit:
 	inc	[dumped_rx_count]
 	xor	ecx, ecx
   .next_resendq:
     cmp     ecx, NUMRESENDENTRIES
-	je	.call_handler	  ; None left
-	;cmp     [esi], al                                       ; XTODO: al -> eax
+	je	.call_handler	  ; None left
 	cmp	[esi + 4], eax
 	je	@f		  ; found one
     inc     ecx
 	add	esi, 8
     inc     ecx
 	add	esi, 8
-	jmp	.next_resendq
 	jmp	.next_resendq
     ;@@: mov     byte[esi], 0xff                                 ; XTODO: 0xff -> 0
     @@: mov	dword[esi + 4], 0
     inc     ecx
 proc stateTCB_SYN_RECEIVED stdcall, sockAddr:DWORD
     ; 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 + 20 + TCP_PACKET.Flags], TH_RST		;xxx
+	test	[edx + 20 + TCP_PACKET.Flags], TH_RST
-	jz	.check_ack					;xxx
+	jz	.check_ack
 	push	[ebx + SOCKET.OrigRemotePort] [ebx + SOCKET.OrigRemoteIP]
 	pop	[ebx + SOCKET.RemoteIP] [ebx + SOCKET.RemotePort]
-	mov	[ebx + SOCKET.TCBState], TCB_LISTEN		;xxx
+	mov	[ebx + SOCKET.TCBState], TCB_LISTEN
-	jmp	.exit						;xxx
+	jmp	.exit
-  .check_ack:							;xxx
+  .check_ack:
 proc stateTCB_ESTABLISHED stdcall, sockAddr:DWORD
     ; Here we are expecting data, or a request to close
     ; OR both...
-    ; Did we receive a FIN or RST?
-;xxx    test    [edx + 20 + TCP_PACKET.Flags], TH_FIN + TH_RST
-;xxx    jz      .check_ack
+    ; Did we receive a FIN or RST?
-	test	[edx + 20 + TCP_PACKET.Flags], TH_FIN		;xxx
+	test	[edx + 20 + TCP_PACKET.Flags], TH_FIN
-	jz	.check_ack					;xxx
+	jz	.check_ack
     ; It was a fin or reset.
     mov     ecx, 0
   .next_resendq:
     cmp     ecx, NUMRESENDENTRIES
-	je	.last_resendq	    ; None left
-	;cmp     [esi], al                                              ; XTODO: al -> eax
+	je	.last_resendq	    ; None left
 	cmp	[esi + 4], eax
 	je	@f		    ; found one
 	inc	ecx
 	add	esi, 8
-	jmp	.next_resendq
 	jmp	.next_resendq
     ;@@: mov     byte[esi], 0xff                                         ; XTODO: 0xff -> 0
     @@: mov	dword[esi + 4], 0
     inc     ecx
 	add	esi, 8
 	jmp	.next_resendq
-  .last_resendq:
-	popad
-;xxx    ; was it a reset?
-;xxx    test    [edx + 20 + TCP_PACKET.Flags], TH_RST
-;xxx    jz      @f
-;xxx    mov     [ebx + SOCKET.TCBState], TCB_CLOSED
+  .last_resendq:
-;xxx    jmp     .exit
+	popad
     ; Read the data bytes, store in socket buffer
 	movzx	ecx, [edx + IP_PACKET.TotalLength]
 	xchg	cl, ch
     sub     ecx, 40                    ; Discard 40 bytes of header
-	jnz	.data			   ; Read data, if any
+	ja	.data			   ; Read data, if any
     ; If we had received a fin, we need to ACK it.
 	cmp	[ebx + SOCKET.TCBState], TCB_CLOSE_WAIT
 	je	.ack
 	jmp	.exit
-  .data:
+  .data:
+	push	ebx
+	add	ebx, SOCKET.lock
-    push    ecx
+	call	wait_mutex
+	pop	ebx
+	push	ecx
+	push	[ebx + SOCKET.PID]	; get socket owner PID
-	add	[ebx + SOCKET.rxDataCount], ecx      ; increment the count of bytes in buffer
+	mov	eax, [ebx + SOCKET.rxDataCount]
 	add	eax, ecx
-	mov	eax, [ebx + SOCKET.PID]       ; get socket owner PID
+	cmp	eax, SOCKETBUFFSIZE - SOCKETHEADERSIZE
-    push    eax
+	ja	.overflow
-	mov	eax, [ebx + SOCKET.rxDataCount]      ; get # of bytes already in buffer
+	mov	[ebx + SOCKET.rxDataCount], eax      ; increment the count of bytes in buffer
     ; point to the location to store the data
+	lea	edi, [ebx + eax + SOCKETHEADERSIZE]
-	lea	edi, [ebx + eax + SOCKETHEADERSIZE]
+	sub	edi, ecx
 	sub	edi, ecx
     add     edx, 40        ; edx now points to the data
-    add     edx, 40        ; edx now points to the data
+    mov     esi, edx
     pop     ebx
     call    queue
   .exit:
+    ret
+  .overflow:
+	; no place in buffer
+	; so simply restore stack and exit
+	pop	eax ecx
+	mov	[ebx + SOCKET.lock], 0
-    ret
+	ret
 endp
 	test	[edx + 20 + TCP_PACKET.Flags], TH_ACK
 	jz	.exit
     ; delete the socket
-	stdcall net_socket_free, ebx
-;        mov     edi, ebx
-;        xor     eax, eax
-;        mov     ecx, SOCKETHEADERSIZE
-;        cld
-;        rep     stosb
+	stdcall net_socket_free, ebx
   .exit:

Subversion Repositories Kolibri OS

(root)/kernel/branches/kolibri_pe/network/tcp.inc – Rev 914 → 2971