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

 ;;         GNU GENERAL PUBLIC LICENSE                              ;;
 ;;          Version 2, June 1991                                   ;;
 ;;                                                                 ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-$Revision: 1529 $
+$Revision: 1533 $
 virtual at 0
 	.start_ptr		dd ? ; Pointer to start of buffer
 	.end_ptr		dd ? ; pointer to end of buffer
 	.read_ptr		dd ? ; Read pointer
 	.write_ptr		dd ? ; Write pointer
 	.size			dd ? ; Number of bytes buffered
+	.end:
+}
 virtual at 0
 	RING_BUFFER	RING_BUFFER
-end virtual
 virtual at TCP_SOCKET.end
+end virtual
 virtual at TCP_SOCKET.end
 	rcv	RING_BUFFER
 	xor	eax, eax
 	mov	edi, net_sockets
 	mov	ecx, 4
 	rep	stosd
-;--- for random port --
-	mov	al, 0x0 		; set up 1s timer
-	out	0x70, al
-	in	al, 0x71
-;----------------------
        @@:
 	pseudo_random eax
 	cmp	ax, MIN_EPHEMERAL_PORT
 	jl	@r
 	cmp	ax, MAX_EPHEMERAL_PORT
-	jg	@r
 	jg	@r
 	mov	[last_UDP_port], ax
        @@:
 	pseudo_random eax
 	cmp	ax, MIN_EPHEMERAL_PORT
 	jl	@r
-	cmp	ax, MAX_EPHEMERAL_PORT
-	jg	@r
+	cmp	ax, MAX_EPHEMERAL_PORT
 	jg	@r
 	pop	[eax + IP_SOCKET.LocalIP] ;;;;
 	cmp	edx, IP_PROTO_TCP
 	jnz	.no_stream
-	mov	esi, eax
-	stdcall kernel_alloc, SOCKET_MAXDATA
-	mov	[esi + rcv.start_ptr], eax
-	mov	[esi + rcv.write_ptr], eax
-	mov	[esi + rcv.read_ptr], eax
-	mov	[esi + rcv.size], 0
-	add	eax,  SOCKET_MAXDATA
-	mov	[esi + rcv.end_ptr], eax
+	mov	ebx, eax
-	stdcall kernel_alloc, SOCKET_MAXDATA
+	lea	eax, [ebx + STREAM_SOCKET.snd]
-	mov	[esi + snd.start_ptr], eax
-	mov	[esi + snd.write_ptr], eax
+	call	SOCKET_ring_create
-	mov	[esi + snd.read_ptr], eax
 	mov	[esi + snd.size], 0
-	add	eax,  SOCKET_MAXDATA
+	lea	eax, [ebx + STREAM_SOCKET.rcv]
 	mov	[eax + TCP_SOCKET.timer_persist], 0
 	mov	[eax + TCP_SOCKET.t_state], TCB_SYN_SENT
 	mov	ebx, [TCP_sequence_num]
 	add	[TCP_sequence_num], 6400
 	mov	[eax + TCP_SOCKET.ISS], ebx
-	mov	[eax + TCP_SOCKET.timer_keepalive], 120 	; 120*640ms => 75,6 seconds
+	mov	[eax + TCP_SOCKET.timer_keepalive], TCP_time_keep_init
+	TCP_sendseqinit eax
-;;;;            mov     [ebx + TCP_SOCKET.timer_retransmission],
+;;;;            mov     [ebx + TCP_SOCKET.timer_retransmission],   ;; todo: create macro to set retransmission timer
 	push	eax
 	DEBUGF	1,"socket_receive: socknum: %u bufaddr: %x, buflength: %u, flags: %x\n", ecx, edx, esi, edi
 	call	SOCKET_num_to_ptr
+	jz	s_error
+	cmp	[eax + SOCKET.Type], IP_PROTO_TCP	;;;;;;;;
-	jz	s_error
+	je	.tcp
 	mov	ebx, esi
 	get_from_queue (eax + SOCKET_QUEUE_LOCATION),\
 		       SOCKET_QUEUE_SIZE,\
 	jz	.nd
 	rep	movsd
 .nd:
 ; remove the packet     ;;; TODO: only if it is empty!!
-;;;;        call    TCP_output  ; only if it is tcp
+	call	kernel_free
+	ret
+  .tcp:
+	mov	ecx, esi
+	mov	edi, edx
+	add	eax, STREAM_SOCKET.rcv
+	call	SOCKET_ring_read
-	call	kernel_free
+	mov	dword[esp+32], ecx			      ; return number of bytes copied in ebx
 	call	SOCKET_find_port
 	jz	s_error
+     @@:
+	push	eax
+	mov	ecx, esi
+	mov	esi, edx
-     @@:
+	add	eax, STREAM_SOCKET.snd
-;;;; TODO: queue the data
+	call	SOCKET_ring_write
 	pop	eax
 	call	kernel_free
 	add	esp, 8
+	ret
+;--------------------------
+;
+; eax = ptr to ring struct (just a buffer of the right size)
+;
+align 4
+SOCKET_ring_create:
+	mov	esi, eax
+	stdcall create_ring_buffer, SOCKET_MAXDATA, PG_SW
+	DEBUGF	1,"SOCKET_ring_created: %x\n", eax
+	mov	[esi + RING_BUFFER.start_ptr], eax
+	mov	[esi + RING_BUFFER.write_ptr], eax
+	mov	[esi + RING_BUFFER.read_ptr], eax
+	mov	[esi + RING_BUFFER.size], 0
+	add	eax,  SOCKET_MAXDATA
+	mov	[esi + RING_BUFFER.end_ptr], eax
 	ret
 ;-----------------------------------------------------------------
+;
-; SOCKET_ring_add
+; SOCKET_ring_write
+;
-; Adds data to a stream socket
+; Adds data to a stream socket, and updates write pointer and size
+;
 ;  IN:  eax = ptr to ring struct
 ;       ecx = data size
 ;       esi = ptr to data
+;
-;  OUT: eax = number of bytes stored
+;  OUT: ecx = number of bytes stored
+;
 ;-----------------------------------------------------------------
 align 4
-SOCKET_ring_add:
+SOCKET_ring_write:
-	DEBUGF	1,"SOCKET_ring_add: ringbuff=%x ptr=%x size=%u\n", eax, esi, ecx
 	DEBUGF	1,"SOCKET_ring_write: ringbuff=%x ptr=%x size=%u\n", eax, esi, ecx
-	mov	edi, [eax + RING_BUFFER.size]
 	add	edi, ecx
-	cmp	edi, SOCKET_MAXDATA
-	jg	.too_large
-	mov	[eax + RING_BUFFER.size], edi	     ; update size
+	add	[eax + RING_BUFFER.size], ecx
-  .copy:
+	cmp	[eax + RING_BUFFER.size], SOCKET_MAXDATA
-	push	ecx	;<<<< 1
-	mov	edi, [eax + RING_BUFFER.write_ptr]   ; set write ptr in edi
-	add	[eax + RING_BUFFER.write_ptr], ecx   ; update write pointer
-	mov	edx, [eax + RING_BUFFER.end_ptr]
+	jg	.too_large
-	cmp	edx, [eax + RING_BUFFER.write_ptr]
-	jg	.copy_in_2
+  .copy:
-	je	.wrap_write_ptr
+	mov	edi, [eax + RING_BUFFER.write_ptr]
+	DEBUGF	2,"Copying %u bytes from %x to %x\n", ecx, esi, edi
+	push	ecx
+	shr	ecx, 1
+	jnc	.nb
+	movsb
+.nb:
-  .copy_more:
+	shr	ecx, 1
+	jnc	.nw
-	push	ecx
+	movsw
+.nw:
+	test	ecx, ecx
+	jz	.nd
+	rep	movsd
+.nd:
+	pop	ecx
+	cmp	edi, [eax + RING_BUFFER.end_ptr]
+	jge	.wrap
-	and	ecx, 3
+	mov	[eax + RING_BUFFER.write_ptr], edi
 	rep	movsb
-	pop	ecx
+	ret
 	shr	ecx, 2
-	rep	movsd
+  .wrap:
-	pop	ecx	; >>>> 1/2
+	sub	edi, SOCKET_MAXDATA
-	DEBUGF	2,"Copied %u bytes\n", ecx
+	mov	[eax + RING_BUFFER.write_ptr], edi
 	ret
 	ret
   .too_large:
-	mov	ecx, SOCKET_MAXDATA				; calculate number of bytes available in buffer
+  .too_large:
-	sub	ecx, [eax + RING_BUFFER.size]
+	mov	ecx, SOCKET_MAXDATA				; calculate number of bytes available in buffer
-	jz	.full
-	mov	[eax + RING_BUFFER.size], SOCKET_MAXDATA	; update size, we will fill buffer completely
-	jmp	.copy
-  .full:
-	DEBUGF	2,"Ring buffer is full!\n"
-	xor	ecx, ecx
-	ret
-  .copy_in_2:
-	DEBUGF	1,"Copying in 2 passes\n"
-	mov	edx, ecx
-	mov	ecx, [eax + RING_BUFFER.end_ptr]    ; find number of bytes till end of buffer
-	sub	ecx, edi
-	sub	edx, ecx
-	push	edx	; <<<< 2
+	sub	ecx, [eax + RING_BUFFER.size]
 	jge	.full
 	mov	edi, [eax + RING_BUFFER.start_ptr]
-	call	.copy_more
+	mov	[eax + RING_BUFFER.size], SOCKET_MAXDATA	; update size, we will fill buffer completely
+	jmp	.copy
   .wrap_write_ptr:
-	sub	[eax + RING_BUFFER.write_ptr], SOCKET_MAXDATA	; update write pointer
+  .full:
-	jmp	.copy_more
+	DEBUGF	2,"Ring buffer is full!\n"
 	xor	ecx, ecx
 	ret
 ;-----------------------------------------------------------------
+;
 ; SOCKET_ring_read
 ;
-; reads the data, but let the data remain in the buffer
+; reads the data, BUT DOES NOT CLEAR IT FROM MEMORY YET
 ;
-;  IN:  eax = ptr to ring struct
-;       ecx = buffer size
+;  IN:  eax = ptr to ring struct
-;       edi = ptr to buffer
-;
+;       ecx = buffer size
-;  OUT: eax = number of bytes read
-;
-;-----------------------------------------------------------------
-align 4
+;       edi = ptr to buffer
 SOCKET_ring_read:
+;  OUT: ecx = number of bytes read
-	DEBUGF	1,"SOCKET_ring_read: ringbuff=%x ptr=%x size=%u\n", eax, esi, ecx
+;
+;-----------------------------------------------------------------
+align 4
-	cmp	[eax + RING_BUFFER.size], ecx	     ; update size
+SOCKET_ring_read:
+	DEBUGF	1,"SOCKET_ring_read: ringbuff=%x ptr=%x size=%u\n", eax, edi, ecx
+	cmp	ecx, [eax + RING_BUFFER.size]
+	jg	.less_data
 	jl	.too_large
+  .copy:
+	mov	esi, [eax + RING_BUFFER.read_ptr]
-	mov	esi, [eax + RING_BUFFER.read_ptr]    ; update read ptr
-  .copy:
+	DEBUGF	2,"Copying %u bytes from %x to %x\n", ecx, esi, edi
-	push	ecx	;<<<< 1
+	push	ecx
-	mov	edx, [eax + RING_BUFFER.read_ptr]
+	shr	ecx, 1
+	jnc	.nb
+	movsb
-	add	edx, ecx
+.nb:
-	cmp	edx, [eax + RING_BUFFER.end_ptr]
-	jg	.copy_in_2
-  .copy_more:
-	push	ecx
-	and	ecx, 3
-	rep	movsb
-	pop	ecx
-	shr	ecx, 2
-	rep	movsd
-	pop	ecx	; >>>> 1/2
-	DEBUGF	2,"Copied %u bytes\n", ecx
-	ret
-  .too_large:
-	mov	ecx, [eax + RING_BUFFER.size]
-	jmp	.copy
+	shr	ecx, 1
 	jnc	.nw
-  .full:
+	movsw
-	DEBUGF	2,"Ring buffer is full!\n"
+.nw:
 align 4
 SOCKET_ring_free:
-	DEBUGF	1,"Trying to free %u bytes of data from ring %x\n", ecx, eax
-	cmp	ecx, [eax + RING_BUFFER.size]
-	jle	.go_for_it
-	cmp	ecx, SOCKET_MAXDATA				;;;;
-	jg	.moron_input
-	mov	ecx, [eax + RING_BUFFER.size]
 	DEBUGF	1,"Trying to free %u bytes of data from ring %x\n", ecx, eax
-  .go_for_it:
+	sub	[eax + RING_BUFFER.size], ecx
-	sub	[eax + RING_BUFFER.size], ecx
+	jl	.sumthinwong
 	add	[eax + RING_BUFFER.read_ptr], ecx
 	mov	edx, [eax + RING_BUFFER.end_ptr]
 	cmp	[eax + RING_BUFFER.read_ptr], edx
 	jl	@f
+	sub	[eax + RING_BUFFER.read_ptr], SOCKET_MAXDATA
-	sub	[eax + RING_BUFFER.read_ptr], SOCKET_MAXDATA	;;;;;
+       @@:
-       @@:
+	ret
 	ret
   .sumthinwong: 	       ; we could free all available bytes, but that would be stupid, i guess..
 	jnz	.no_stream
 	cmp	[eax + SOCKET.Type], IP_PROTO_TCP
 	jnz	.no_stream
-	stdcall kernel_free, [eax + rcv.start_ptr]
+	stdcall kernel_free, [eax + STREAM_SOCKET.rcv + RING_BUFFER.start_ptr]
-	stdcall kernel_free, [eax + snd.start_ptr]
+	stdcall kernel_free, [eax + STREAM_SOCKET.snd + RING_BUFFER.start_ptr]
   .no_stream:
   .error:
 	ret
-; socket nr in ebx
+; IN:  socket nr in ebx
-; new socket nr in eax
+; OUT: socket nr in eax
-; preserver edx
+; preserves edx
 ; SOCKET_num_to_ptr
+;
 ; Get socket structure address by its number
+;
 ; IN:  ecx = socket number
-; OUT: ecx = 0 on error, socket ptr otherwise
+; OUT: eax = 0 on error, socket ptr otherwise
 ;       ZF = set on error
+;
 ;---------------------------------------------------
 align 4
 SOCKET_num_to_ptr:

Subversion Repositories Kolibri OS

(root)/kernel/branches/net/network/socket.inc – Rev 1529 → 1533