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

 ;; Copyright (C) KolibriOS team 2004-2010. All rights reserved.    ;;
 ;; Distributed under terms of the GNU General Public License       ;;
 ;;                                                                 ;;
 ;;  SOCKET.INC                                                     ;;
 ;;                                                                 ;;
-;;    Written by hidnplayr@kolibrios.org                           ;;
+;;    Written by hidnplayr@kolibrios.org,                          ;;
+;;     and Clevermouse.                                            ;;
+;;                                                                 ;;
-;;     based on code by mike.dld                                   ;;
+;;       Based on code by mike.dld                                 ;;
 ;;                                                                 ;;
-;;          GNU GENERAL PUBLIC LICENSE                             ;;
+;;         GNU GENERAL PUBLIC LICENSE                              ;;
-;;             Version 2, June 1991                                ;;
+;;          Version 2, June 1991                                   ;;
 ;;                                                                 ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-$Revision: 1519 $
+$Revision: 1529 $
 virtual at 0
 	.Type			dd ? ; RAW/UDP/TCP/...
 	.Protocol		dd ? ; ICMP/IPv4/ARP/
 	.errorcode		dd ?
-	.options		dd ?
-	.SO_SND.SB_CC		dd ?  ;;;;; socket options: number of bytes in socket
-	.SO_RCV.SB_CC		dd ?
+	.options		dd ?
-	.state			dd ?  ;;;;;;;;;
+	.state			dd ?
 	.end:
 				rd 3 ; for IPv6 addresses
 	.end:
-end virtual
-virtual at SOCKET.end
-	SOCKET_virtual:
-	.ConnectedTo		dd ? ; Socket number of other socket this one is connected to
-	.end:
 end virtual
 virtual at IP_SOCKET.end
 	.SND_CWND		dd ?
 	.SND_SSTHRESH		dd ?
 ;----------------------
-; Transmit timing stuff
 ; Transmit timing stuff
 	.t_idle 		dd ?
 	.t_rtt			dd ?
 	.t_rtseq		dd ?
 	.t_srtt 		dd ?
 	.t_rttvar		dd ?
 	.t_rttmin		dd ?
 	.max_sndwnd		dd ?
-;-----------------
-; Out-of-band data
+;-----------------
 ; Out-of-band data
 	.t_oobflags		dd ?
 	.t_iobc 		dd ?
 	.t_softerror		dd ?
 ;---------
-; RFC 1323
+;---------
 ; RFC 1323
 	.last_ack_sent		dd ?
-;-------
-; Timers
+;-------
 ; Timers
-	.timer_retransmission	dw ?	; rexmt
+	.timer_retransmission	dw ? ; rexmt
 	.timer_ack		dw ?
 	.timer_persist		dw ?
 	.Identifier		dw ? ;
 	.end:
+end virtual
+struc	RING_BUFFER {
+	.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
+}
+virtual at 0
+	RING_BUFFER	RING_BUFFER
+end virtual
+virtual at TCP_SOCKET.end
+	rcv	RING_BUFFER
+	snd	RING_BUFFER
+ STREAM_SOCKET:
+	.end:
 end virtual
 struct	socket_queue_entry
-;        .owner          dd ?
+struct	socket_queue_entry
 	.data_ptr	dd ?
 	.buf_ptr	dd ?
-	.data_size	dd ?
-	.size:
+	.data_size	dd ?
-ends
+	.size:
 ends
 ;-----------------------------------------------------------------
+;
 ; SOCKET_init
-;
-;  -
-;
-;  IN:  /
-;  OUT: /
+;
-;-----------------------------------------------------------------
-align 4
+;-----------------------------------------------------------------
-socket_init:
+macro	SOCKET_init {
 	xor	eax, eax
 	mov	edi, net_sockets
-	mov	ecx, 4
-	rep	stosd
+	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
+	mov	[last_UDP_port], ax
+       @@:
+	pseudo_random eax
+	cmp	ax, MIN_EPHEMERAL_PORT
+	jl	@r
+	cmp	ax, MAX_EPHEMERAL_PORT
+	jg	@r
 	mov	[last_UDP_port], MIN_EPHEMERAL_PORT
-	mov	[last_TCP_port], MIN_EPHEMERAL_PORT
+	mov	[last_TCP_port], ax
 	ret
 ;-----------------------------------------------------------------
+;
 ; Socket API (function 74)
 ;
 ;-----------------------------------------------------------------
+align 4
+sys_socket:
+	cmp	ebx, 8		; highest possible number
-align 4
+	jg	@f
+	lea	ebx, [sock_sysfn_table + 4*ebx]
+	jmp	dword [ebx]
+       @@:
+	cmp	ebx, 255
+	jz	SOCKET_debug
-sys_socket:
+s_error:
-	cmp	ebx, 8		; highest possible number
+	DEBUGF	1,"socket error\n"
-	jg	s_error
+	mov	dword [esp+32], -1
 	lea	ebx, [.table + 4*ebx]
-	jmp	dword [ebx]
+	ret
 	dd	SOCKET_receive	; 7
 	dd	SOCKET_get_opt	; 8
 ;        dd      SOCKET_set_opt  ; 9
-s_error:
-	DEBUGF	1,"socket error\n"
-	mov	dword [esp+32], -1
 	ret
 ;-----------------------------------------------------------------
 	mov	[eax + SOCKET.Type], edx
 	mov	[eax + SOCKET.Protocol], esi
+	mov	[esp+32], edi
+	cmp	ecx, AF_INET4
+	jnz	.no_stream
+	push	[IP_LIST]		  ;;;;
+	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
+	stdcall kernel_alloc, SOCKET_MAXDATA
+	mov	[esi + snd.start_ptr], eax
+	mov	[esi + snd.write_ptr], eax
+	mov	[esi + snd.read_ptr], eax
+	mov	[esi + snd.size], 0
+	add	eax,  SOCKET_MAXDATA
+	mov	[esi + snd.end_ptr], eax
+	ret
+  .no_stream:
+	push	edi
+	init_queue (eax + SOCKET_QUEUE_LOCATION)
-	mov	[esp+32], edi
+	pop	edi
     .got_port:
 	DEBUGF	1,"using local port: %u\n", bx
-	mov	word [eax + UDP_SOCKET.LocalPort], bx
-	mov	ebx, dword [edx + 4]
-	mov	dword [eax + IP_SOCKET.LocalIP], ebx
+	mov	word [eax + UDP_SOCKET.LocalPort], bx
 	DEBUGF	1,"local ip: %u.%u.%u.%u\n",\
 	[eax + IP_SOCKET.LocalIP + 0]:1,[eax + IP_SOCKET.LocalIP + 1]:1,\
 	mov	dword [esp+32], 0
 	ret
-  .tcp:
-	; set sequence number
-	mov	ebx, [TCP_sequence_num]
-	add	[TCP_sequence_num], 6400
-	mov	[eax + TCP_SOCKET.ISS], ebx
 	mov	[eax + TCP_SOCKET.timer_keepalive], 120 	; 120*630ms => 75,6 seconds
   .tcp:
 	lea	ebx, [eax + SOCKET.lock]
-	call	wait_mutex
-	; fill in remote port and IP
+	call	wait_mutex
-;;;;;;        mov     [eax + TCP_SOCKET.wndsizeTimer], 0     ; Reset the window timer.
+	; fill in remote port and IP
 	mov	bx , word [edx + 2]
 	mov	[eax + TCP_SOCKET.RemotePort], bx
-	DEBUGF	1,"remote port: %u\n", bx
-	mov	ebx, dword [edx + 4]
-	mov	[eax + IP_SOCKET.RemoteIP], ebx
-	; check if local port and IP is ok
 	DEBUGF	1,"remote port: %u\n", bx
 	cmp	[eax + IP_SOCKET.LocalIP], 0
-	jne	@f
+	mov	ebx, dword [edx + 4]
-	push	[IP_LIST]	    ;;;;; device zero = default
+	mov	[eax + IP_SOCKET.RemoteIP], ebx
+	; check if local port and IP is ok
+	cmp	[eax + TCP_SOCKET.LocalPort], 0
+	jne	@f
+	call	SOCKET_find_port
+       @@:
+	DEBUGF	1,"local port: %u\n", [eax + TCP_SOCKET.LocalPort]:2
-	pop	[eax + IP_SOCKET.LocalIP]
+;;;;;
-       @@:
+	mov	[eax + TCP_SOCKET.timer_persist], 0
 	mov	[eax + TCP_SOCKET.t_state], TCB_SYN_SENT
+	mov	ebx, [TCP_sequence_num]
-	cmp	[eax + TCP_SOCKET.LocalPort], 0
+	add	[TCP_sequence_num], 6400
-	jne	@f
+	mov	[eax + TCP_SOCKET.ISS], ebx
-	call	SOCKET_find_port
+	mov	[eax + TCP_SOCKET.timer_keepalive], 120 	; 120*640ms => 75,6 seconds
   .tcp:
 	test	[eax + TCP_SOCKET.t_state], TCB_SYN_RECEIVED  ;;;;;;
 	jz	.free
-	call	TCP_output
+  ;;;      call    TCP_output
-	mov	dword [esp+32], 0
+  ;;;      mov     dword [esp+32], 0
-	ret
+  ;;;      ret
 	jmp	s_error
   .af_inet4:
+	DEBUGF	1,"af_inet4\n"
+	cmp	[eax + IP_SOCKET.LocalIP], 0
+	jne	@f
+	mov	ebx, [IP_LIST]				;;;;
+	mov	dword [eax + IP_SOCKET.LocalIP], ebx
-	DEBUGF	1,"af_inet4\n"
+       @@:
 	cmp	[eax + SOCKET.Type], IP_PROTO_TCP
 	je	.tcp
 @@:
 	mov	dword [esp+32], 0
 	ret
+;-----------------------------------------------------------------
+;
+; SOCKET_debug
+;
+;  Copies socket variables to application buffer
+;
+;  IN:  ecx = socket number
+;       edx = pointer to buffer
+;
+;  OUT: -1 on error
+;-----------------------------------------------------------------
+align 4
+SOCKET_debug:
+	DEBUGF	1,"socket_debug\n"
+	call	SOCKET_num_to_ptr
+	jz	s_error
+	mov	esi, eax
+	mov	edi, edx
+	mov	ecx, SOCKETBUFFSIZE/4
+	rep	movsd
+	mov	dword [esp+32], 0
+	ret
 ;-----------------------------------------------------------------
+;
 ; SOCKET_find_port
 	ret
+;-----------------------------------------------------------------
+;
+; SOCKET_ring_add
+;
+; Adds data to a stream socket
+;
+;  IN:  eax = ptr to ring struct
+;       ecx = data size
+;       esi = ptr to data
+;
+;  OUT: eax = number of bytes stored
+;
+;-----------------------------------------------------------------
+align 4
+SOCKET_ring_add:
+	DEBUGF	1,"SOCKET_ring_add: 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
+  .copy:
+	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]
+	cmp	edx, [eax + RING_BUFFER.write_ptr]
+	jg	.copy_in_2
+	je	.wrap_write_ptr
+  .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, SOCKET_MAXDATA				; calculate number of bytes available in buffer
+	sub	ecx, [eax + RING_BUFFER.size]
+	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
+	mov	edi, [eax + RING_BUFFER.start_ptr]
+	call	.copy_more
+  .wrap_write_ptr:
+	sub	[eax + RING_BUFFER.write_ptr], SOCKET_MAXDATA	; update write pointer
+	jmp	.copy_more
+;-----------------------------------------------------------------
+;
+; SOCKET_ring_read
+;
+; reads the data, but let the data remain in the buffer
+;
+;  IN:  eax = ptr to ring struct
+;       ecx = buffer size
+;       edi = ptr to buffer
+;
+;  OUT: eax = number of bytes read
+;
+;-----------------------------------------------------------------
+align 4
+SOCKET_ring_read:
+	DEBUGF	1,"SOCKET_ring_read: ringbuff=%x ptr=%x size=%u\n", eax, esi, ecx
+	cmp	[eax + RING_BUFFER.size], ecx	     ; update size
+	jl	.too_large
+	mov	esi, [eax + RING_BUFFER.read_ptr]    ; update read ptr
+  .copy:
+	push	ecx	;<<<< 1
+	mov	edx, [eax + RING_BUFFER.read_ptr]
+	add	edx, ecx
+	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
+  .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
+	mov	esi, [eax + RING_BUFFER.start_ptr]
+	call	.copy_more
+;-----------------------------------------------------------------
+;
+; SOCKET_ring_free
+;
+; Free's some bytes from the ringbuffer
+;
+;  IN:  eax = ptr to ring struct
+;       ecx = data size
+;
+;  OUT: ecx = number of bytes free-ed
+;
+;-----------------------------------------------------------------
+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]
+  .go_for_it:
+	sub	[eax + RING_BUFFER.size], ecx
+	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	;;;;;
+       @@:
+	ret
+  .moron_input:
+	xor	ecx, ecx
+	ret
 ;-----------------------------------------------------------------
+;
 ; SOCKET_notify_owner
+;
 ; notify's the owner of a socket that something happened
 SOCKET_alloc:
 	push	ecx ebx
 	stdcall kernel_alloc, SOCKETBUFFSIZE
-	DEBUGF	1, "socket_alloc: %x ", eax
+	DEBUGF	1, "SOCKET_alloc: ptr=%x\n", eax
 	or	eax, eax
 	jz	.exit
 	mov	ecx, SOCKETBUFFSIZE / 4
 	xor	eax, eax
 	rep	stosd
 	pop	edi eax
-	init_queue (eax + SOCKET_QUEUE_LOCATION)
-; find first free socket number and use it
 ; find first free socket number and use it
 	mov	ebx, net_sockets
 	xor	ecx, ecx
   .next_socket_number:
 	inc	ecx
   .next_socket:
 	mov	ebx, [ebx + SOCKET.NextPtr]
-	or	ebx, ebx
+	test	ebx, ebx
 	jz	.last_socket
 	cmp	[ebx + SOCKET.Number], ecx
 	jne	.next_socket
 	mov	ebx, net_sockets
 	jmp	.next_socket_number
-  .last_socket:
-	mov	[eax + SOCKET.Number], ecx
+  .last_socket:
+	mov	[eax + SOCKET.Number], ecx
 	DEBUGF	1, "SOCKET_alloc: number=%u\n", ecx
-	DEBUGF	1, "(number: %u)\n", ecx
+	mov	edi, ecx
-; Fill in PID
-	mov	ebx, [TASK_BASE]
+; Fill in PID
-	mov	ebx, [ebx + TASKDATA.pid]
+	mov	ebx, [TASK_BASE]
-	mov	[eax + SOCKET.PID], ebx
+	mov	ebx, [ebx + TASKDATA.pid]
 	mov	[eax + SOCKET.PID], ebx
 ; add socket to the list by changing pointers
+; add socket to the list by re-arranging some pointers
 	mov	ebx, [net_sockets + SOCKET.NextPtr]
 	mov	[eax + SOCKET.PrevPtr], net_sockets
 	mov	[eax + SOCKET.NextPtr], ebx
-	or	ebx, ebx
+	test	ebx, ebx
 	jz	@f
 	add	ebx, SOCKET.lock	; lock the next socket
-	call	wait_mutex
-	sub	ebx, SOCKET.lock
-	mov	[ebx + SOCKET.PrevPtr], eax
+	call	wait_mutex
-	mov	[ebx + SOCKET.lock], 0
+	sub	ebx, SOCKET.lock
-       @@:
+	mov	[ebx + SOCKET.PrevPtr], eax
 	mov	[ebx + SOCKET.lock], 0
 	lea	ebx, [eax + SOCKET.lock]
 	call	wait_mutex
+	DEBUGF	1, "freeing socket..\n"
+	cmp	[eax + SOCKET.Domain], AF_INET4
+	jnz	.no_stream
+	cmp	[eax + SOCKET.Type], IP_PROTO_TCP
+	jnz	.no_stream
+	stdcall kernel_free, [eax + rcv.start_ptr]
+	stdcall kernel_free, [eax + snd.start_ptr]
-	DEBUGF	1, "freeing socket..\n"
+  .no_stream:
 	push	eax				; this will be passed to kernel_free
 	mov	ebx, [eax + SOCKET.NextPtr]
   .error:
+	ret
+; socket nr in ebx
+; new socket nr in eax
+; preserver edx
+align 4
+SOCKET_fork:
+;; Exit if backlog queue is full
+;        mov     ax, [ebx + TCP_SOCKET.backlog_cur]
+;        cmp     ax, [ebx + TCP_SOCKET.backlog]
+;        jae     .exit
+; Allocate new socket
+	call	SOCKET_alloc
+     ;;;   jz      .fail
+; Copy structure from current socket to new, (including lock!)
+; We start at PID to reserve the socket num, and the 2 pointers at beginning of socket
+	lea	esi, [edx + SOCKET.PID]
+	lea	edi, [eax + SOCKET.PID]
+	mov	ecx, (TCP_SOCKET.end - SOCKET.PID + 3)/4
+	rep	movsd
+;; Push pointer to new socket to queue
+;        movzx   ecx, [ebx + TCP_SOCKET.backlog_cur]
+;        inc     [ebx + TCP_SOCKET.backlog_cur]
+;        mov     [ebx + TCP_SOCKET.end + ecx*4], eax
+;;;;        mov     [eax + IP_SOCKET.RemoteIP], esi ; IP source address
 	ret
 ;---------------------------------------------------
+;

Subversion Repositories Kolibri OS

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