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

 ;;             Version 2, June 1991                                ;;
 ;;                                                                 ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-$Revision: 1274 $
+$Revision: 1281 $
 TCP_RETRIES		equ 5		; Number of times to resend a Packet
 ends
 struct	tcp_in_queue_entry
 	.data_ptr	dd ?
 	.data_size	dd ?
-	.offset 	dd ?
+	.offset 	dd ?	; TODO: replace this in code by absolute address isntead of relative offset
 	.size:
 ends
   .remove_it:
 	push	[esi + tcp_out_queue_entry.data_ptr]
 	mov	[esi + tcp_out_queue_entry.data_ptr], 0
+	call	kernel_free
-	call	kernel_free
+	dec	[TCP_OUT_QUEUE]
 	jmp	.find_next
+;
 ; TCP_send  (Assumes socket mutex set)
+;
 ; IN: eax = socket pointer
 ;      bl = flags
-;      ecx = number of bytes to send, may be set to 0
+;      ecx = number of bytes to send, may be set to 0  (single ACK)
 ;      esi = pointer to data
+;
 ;-----------------------------------------------------------------
 align 4
 TCP_send:
 	DEBUGF 1,"Creating TCP packet, socket: %x, flags: %x\n",eax, bl
 	mov	di , IP_PROTO_TCP
 	add	ecx, TCP_Packet.Data
-	push	bx eax esi
+	push	ecx bx eax esi
 ; Create an IPv4 Packet of the correct size
 	mov	ebx, [eax + SOCKET_head.end + IPv4_SOCKET.LocalIP]
 	pop	esi
 ; fill in tcp sequence number
 	push	[esi + SOCKET_head.end + IPv4_SOCKET.end + TCP_SOCKET.SND_NXT]
-	pop	[edi + TCP_Packet.SequenceNumber]
-	inc_INET (ebx + SOCKET_head.end + IPv4_SOCKET.end + TCP_SOCKET.SND_NXT) ;;;;;;;;
+	pop	[edi + TCP_Packet.SequenceNumber]
 ; Fill in local and remote ports
 	mov	[edi + TCP_Packet.Window], 0x0005	   ; 1280 bytes
 	mov	[edi + TCP_Packet.UrgentPointer], 0
 	mov	[edi + TCP_Packet.DataOffset], 0x50
 	mov	[edi + TCP_Packet.Checksum], 0
+; Get size of total packet back in ecx
 	pop	ecx
 ; Push pointer to and size of total packet (needed for send procedure)
-	push	edx eax
 	push	edx eax
 ; push socket number (for TCP_add_to_queue)
 	push	esi
+; Now, calculate the checksum
+	xchg	cl, ch
+	pushw	cx
-; Now, calculate the checksum                  ; TODO: calculate correct checksum for packets with data
+	xchg	cl, ch
-	pushw	TCP_Packet.Data 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
 	xor	edx, edx
-	mov	ecx, TCP_Packet.Data
+;        mov     ecx, TCP_Packet.Data
 	mov	esi, edi
 	call	checksum_1
-	mov	ecx, 12
-	mov	esi, esp
+	mov	ecx, 12
-	call	checksum_1
+	mov	esi, esp
-	add	esp, 12 				   ; remove the pseudoheader from stack
+	call	checksum_1
+; and store it in TCP header
-; and store it in TCP header
 	call	checksum_2
 	mov	[edi + TCP_Packet.Checksum], dx
 	add	esp, 10 				   ; remove the pseudoheader from stack
 ; At last send the packet!
+	DEBUGF 1,"Sending TCP Packet to device %x\n", ebx
+	mov	edx, [edi + TCP_Packet.SequenceNumber]
-	DEBUGF 1,"Sending TCP Packet to device %x\n", ebx
+	bswap	edx
+	mov	esi, [ebx + ETH_DEVICE.transmit]
+	pop	cx					   ; get the length from packet, back from pseudoheader
+	pop	edi
+	cmp	cx, TCP_Packet.Data shl 8		   ; if the packet has no data
+	je	.only_one				   ; send it only once
+	and	ecx, 0x0000ffff
+	xchg	cl, ch
+	sub	cx, TCP_Packet.Data
-	mov	edx, [edi + TCP_Packet.SequenceNumber]
+	add_INET (edi + SOCKET_head.end + IPv4_SOCKET.end + TCP_SOCKET.SND_NXT)
+	mov	ecx, TCP_RETRIES
+	jmp	.go_for_it
+  .only_one:
+;        inc_INET (edi + SOCKET_head.end + IPv4_SOCKET.end + TCP_SOCKET.SND_NXT)
+	mov	ecx, 1
-	bswap	edx
+  .go_for_it:
 	mov	esi, [ebx + ETH_DEVICE.transmit]
-	pop	edi
+	mov	[edi + SOCKET_head.lock], 0
-	jmp	TCP_queue
+	jmp	TCP_queue				; At last send the packet!
 ;       [esp + 4] size of buffer
 ;       ebx = driver struct
 ;       esi = sender proc
 ;       edx = sequence number of this packet in normal byte order
 ;       edi = socket number
+;       ecx = retries
 ;  OUT: /
+;
 ;-----------------------------------------------------------------
 align 4
 TCP_queue:
 	bswap	edx
 	cmp	[TCP_OUT_QUEUE], TCP_QUEUE_SIZE
+	jge	.full
 	jge	.full
 	push	ecx
 	mov	ecx, TCP_QUEUE_SIZE
 	mov	eax, TCP_OUT_QUEUE+4
 	loop	.loop
   .full:			; silently discard the packet
+	DEBUGF 1,"TCP queue is full!\n"
 	DEBUGF 1,"TCP queue is full!\n"
 	add	esp, 4
 	call	kernel_free
 	add	esp, 4
 	ret
 	ret
   .found_it:			; eax points to empty queue entry
-  .found_it:			; eax points to empty queue entry
-	pop	[eax + tcp_out_queue_entry.data_ptr]
+	pop	[eax + tcp_out_queue_entry.retries]
-	pop	[eax + tcp_out_queue_entry.data_size]
+	pop	[eax + tcp_out_queue_entry.data_ptr]
-	mov	[eax + tcp_out_queue_entry.ttl], 1			; send immediately
+	pop	[eax + tcp_out_queue_entry.data_size]
 	bswap	eax
 	cmp	eax, [edx + TCP_Packet.SequenceNumber]
 	jne	.exit
 ; Calculate next sequencenumber
-	test	ecx, ecx
+;;        test    ecx, ecx
-	jnz	@f
+;;        jnz     @f
-	inc	ecx
+;;        inc     ecx
-       @@:
+;;       @@:
 	add_INET (ebx + SOCKET_head.end + IPv4_SOCKET.end + TCP_SOCKET.RCV_NXT)
-	test	[edx + TCP_Packet.Flags], TH_FIN
+	test	[edx + TCP_Packet.Flags], TH_FIN + TH_RST ;;;
 	jnz	.fin
       @@:
 	pop	ecx
 ; Now, see if we received any data
 	test	ecx, ecx
-	jz	.ack
+	jz	.exit
 	DEBUGF	1,"Got %u bytes data!\n", ecx
 ; calculate header length
 	movzx	eax, [edx + TCP_Packet.DataOffset]
 	and	eax, 11110000b
 	shr	eax, 2
+       DEBUGF 1,"TCP header size: %u\n", eax
-       DEBUGF 1,"TCP header size: %u\n", eax
+	add	edx, eax	; now edx points to data
-	add	edx, eax
 	add	esp, 4
+	pop	esi		; pointer to buffer
-	pop	esi
+	add	esp, 4
-	add	esp, 4
 	sub	edx, esi
+	mov	edi, edx	; offset
-	mov	edi, edx
+	mov	eax, ebx	; socket ptr
+	call	socket_internal_receiver	; Place the data from packet into socket
+	lea	ebx, [eax + SOCKET_head.lock]  ;;;;;
-	mov	eax, ebx
+	call	wait_mutex			 ;;;;;
-	jmp	socket_internal_receiver	; Place the data from packet into socket
+	mov	ebx, eax			   ;;;;
   .ack:

Subversion Repositories Kolibri OS

(root)/kernel/branches/net/network/tcp.inc – Rev 1274 → 1281