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

 ;;         GNU GENERAL PUBLIC LICENSE                              ;;
 ;;          Version 2, June 1991                                   ;;
 ;;                                                                 ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-$Revision: 1542 $
+$Revision: 1543 $
 virtual at 0
 	.lock			dd ? ; lock mutex
 	.PID			dd ? ; application process id
 	.Domain 		dd ? ; INET/UNIX/..
-	.Type			dd ? ; RAW/UDP/TCP/...
+	.Type			dd ? ; RAW/STREAM/DGRAP
-	.Protocol		dd ? ; ICMP/IPv4/ARP/
+	.Protocol		dd ? ; ICMP/IPv4/ARP/TCP/UDP
-	.errorcode		dd ?
+;        .errorcode              dd ?
 	.options		dd ?
-	.options		dd ?
+	.state			dd ?
-	.state			dd ?
+	.backlog		dw ? ; how many incomming connections that can be queued
 	TCP_SOCKET:
 	.LocalPort		dw ?
-	.RemotePort		dw ?
-	.backlog		dw ? ; Backlog
-	.backlog_cur		dw ? ; current size of queue for un-accept-ed connections
+	.RemotePort		dw ?
 	.OrigRemoteIP		dd ? ; original remote IP address (used to reset to LISTEN state)
 	.OrigRemotePort 	dw ? ; original remote port (used to reset to LISTEN state)
 	.snd	rd     RING_BUFFER.end/4
 	.end:
-end virtual
 end virtual
 struct	socket_queue_entry
 	.data_ptr	dd ?
 	.buf_ptr	dd ?
 SOCKETBUFFSIZE		equ 4096     ; in bytes
 SOCKET_QUEUE_SIZE	equ 10	     ; maximum number ofincoming packets queued for 1 socket
 ; the incoming packet queue for sockets is placed in the socket struct itself, at this location from start
-SOCKET_QUEUE_LOCATION	equ SOCKETBUFFSIZE - SOCKET_QUEUE_SIZE*socket_queue_entry.size - queue.data
+SOCKET_QUEUE_LOCATION	equ (SOCKETBUFFSIZE - SOCKET_QUEUE_SIZE*socket_queue_entry.size - queue.data)
 uglobal
-uglobal
+	net_sockets	rd 4
-	net_sockets	rd 4
+	last_socket_num dd ?
 ;-----------------------------------------------------------------
 macro	SOCKET_init {
 	xor	eax, eax
 	mov	edi, net_sockets
-	mov	ecx, 4
+	mov	ecx, 5
 	rep	stosd
        @@:
 	mov	[eax + SOCKET.Protocol], esi
 	cmp	ecx, AF_INET4
-	jne	.no_inet4
-	push	[IP_LIST]
-	pop	[eax + IP_SOCKET.LocalIP]	; fill in local ip number
+	jne	.no_inet4
 	cmp	edx, SOCK_DGRAM
 	je	.udp
   .no_inet4:
 	ret
 align 4
   .raw:
-;        test    esi, esi       ; IP_PROTO_IP
+	test	esi, esi       ; IP_PROTO_IP
-;        jz      .ip
+	jz	.ip
 	cmp	esi, IP_PROTO_ICMP
 	ret
 align 4
   .udp:
-	mov	[eax + SOCKET.Protocol], IP_PROTO_UDP
-	call	SOCKET_find_port		; fill in a local port number, application may change it later, or use this one
-	push	eax
-	init_queue (eax + SOCKET_QUEUE_LOCATION)
-	pop	eax
 	mov	[eax + SOCKET.Protocol], IP_PROTO_UDP
 	mov	[eax + SOCKET.snd_proc], SOCKET_send_udp
-	mov	[eax + SOCKET.rcv_proc], SOCKET_receive_dgram
 	mov	[eax + SOCKET.rcv_proc], SOCKET_receive_dgram
 	ret
 align 4
-  .tcp:
-	mov	[eax + SOCKET.Protocol], IP_PROTO_TCP
-	call	SOCKET_find_port		; fill in a local port number, application may change it later, or use this one
-	mov	ebx, eax
-	lea	eax, [ebx + STREAM_SOCKET.snd]
-	call	SOCKET_ring_create
-	lea	eax, [ebx + STREAM_SOCKET.rcv]
-	call	SOCKET_ring_create
+  .tcp:
+	mov	[eax + SOCKET.Protocol], IP_PROTO_TCP
-	mov	[ebx + SOCKET.snd_proc], SOCKET_send_tcp
-	mov	[ebx + SOCKET.rcv_proc], SOCKET_receive_tcp
+	mov	[eax + SOCKET.snd_proc], SOCKET_send_tcp
+	mov	[eax + SOCKET.rcv_proc], SOCKET_receive_tcp
 	ret
-;align 4
-;  .ip:
-;
-;        push    eax
-;        init_queue (eax + SOCKET_QUEUE_LOCATION)
-;        pop     eax
+align 4
-;
-;        mov     [eax + SOCKET.snd_proc], SOCKET_send_ip
+  .ip:
-;        mov     [eax + SOCKET.rcv_proc], SOCKET_receive_dgram
+	mov	[eax + SOCKET.snd_proc], SOCKET_send_ip
-;
-;        ret
-align 4
-  .icmp:
+	mov	[eax + SOCKET.rcv_proc], SOCKET_receive_dgram
 	ret
-	push	eax
 	init_queue (eax + SOCKET_QUEUE_LOCATION)
 	pop	eax
 	je	.af_unix
 	jmp	s_error
   .af_unix:
   .af_unix:
 	; TODO: write code here
 	DEBUGF	1,"af_inet4\n"
 	cmp	esi, 6
 	jl	s_error
-	mov	bx, word [edx + 2]
-	test	bx, bx
-	jz	.use_preset_port
-	call	SOCKET_check_port
-	jz	s_error
-	DEBUGF	1,"using local port: %u\n", bx
+	push	word [edx + 2]
+	pop	word [eax + UDP_SOCKET.LocalPort]
 	mov	word [eax + UDP_SOCKET.LocalPort], bx
 	push	dword [edx + 4]
-  .use_preset_port:
+	pop	[eax + IP_SOCKET.LocalIP]
 	je	.af_inet4
 	jmp	s_error
+  .af_inet4:
+	cmp	[eax + IP_SOCKET.LocalIP], 0
+	jne	@f
+	push	[IP_LIST]
 	pop	[eax + IP_SOCKET.LocalIP]
-  .af_inet4:
+       @@:
 	jmp	s_error
+align 4
+  .udp:
+	lea	ebx, [eax + SOCKET.lock]
-align 4
+	call	wait_mutex
-  .udp:
+	push	word [edx + 2]
+	pop	[eax + UDP_SOCKET.RemotePort]
+	push	dword [edx + 4]
+	pop	[eax + IP_SOCKET.RemoteIP]
+	cmp	[eax + UDP_SOCKET.LocalPort], 0
+	jne	@f
+	call	SOCKET_find_port
-	mov	bx , word [edx + 2]
+       @@:
-	mov	word [eax + UDP_SOCKET.RemotePort], bx
-	mov	[eax + UDP_SOCKET.firstpacket], 0
-	DEBUGF	1,"remote port: %u\n",bx
+	mov	[eax + UDP_SOCKET.firstpacket], 0
+	push	eax
-	mov	ebx, dword [edx + 4]
+	init_queue (eax + SOCKET_QUEUE_LOCATION)	; Set up data receiving queue
-	mov	dword [eax + IP_SOCKET.RemoteIP], ebx
+	pop	   eax
 	DEBUGF	1,"remote ip: %u.%u.%u.%u\n",[edx+4]:1,[edx+5]:1,[edx+6]:1,[edx+7]:1
 	mov	[eax + SOCKET.lock], 0
 	mov	dword [esp+32], 0
 	ret
+align 4
-align 4
+  .tcp:
-  .tcp:
+	lea	ebx, [eax + SOCKET.lock]
-	lea	ebx, [eax + SOCKET.lock]
 	call	wait_mutex
+	push	word [edx + 2]
+	pop	[eax + TCP_SOCKET.RemotePort]
-	; fill in remote port and IP
-	mov	bx , word [edx + 2]
+	push	dword [edx + 4]
-	mov	[eax + TCP_SOCKET.RemotePort], bx
+	pop	[eax + IP_SOCKET.RemoteIP]
 	DEBUGF	1,"remote port: %u\n", bx
 	cmp	[eax + TCP_SOCKET.LocalPort], 0
-	mov	ebx, dword [edx + 4]
+	jne	@f
-	mov	[eax + IP_SOCKET.RemoteIP], ebx
+	call	SOCKET_find_port
+       @@:
 ;;;;;
 	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], TCP_time_keep_init
-	mov	ebx, [TCP_sequence_num]
+	TCP_sendseqinit eax
+;        mov     [ebx + TCP_SOCKET.timer_retransmission],   ;; todo: create macro to set retransmission timer
-	add	[TCP_sequence_num], 6400
-	mov	[eax + TCP_SOCKET.ISS], ebx
+	push	eax
-	mov	[eax + TCP_SOCKET.timer_keepalive], TCP_time_keep_init
+	call	TCP_output
 	pop	eax
+	mov	ebx, eax
-	TCP_sendseqinit eax
+	lea	eax, [ebx + STREAM_SOCKET.snd]
 	call	SOCKET_ring_create
+	lea	eax, [ebx + STREAM_SOCKET.rcv]
+	call	SOCKET_ring_create
+	mov	[ebx + SOCKET.lock], 0
-;;;;            mov     [ebx + TCP_SOCKET.timer_retransmission],   ;; todo: create macro to set retransmission timer
+	mov	dword [esp+32], 0
 	ret
 	push	eax
-	call	TCP_output
+align 4
 	jne	s_error
 	cmp	[eax + SOCKET.Protocol], IP_PROTO_TCP
 	jne	s_error
+	cmp	[eax + TCP_SOCKET.LocalPort], 0
+	je	s_error
+	cmp	[eax + IP_SOCKET.LocalIP], 0
+	jne	@f
+	push	[IP_LIST]
 	pop	[eax + IP_SOCKET.LocalIP]
-	; TODO: check local port number
+       @@:
 	cmp	edx, MAX_backlog
-	jle	.ok
+	jle	@f
+	mov	edx, MAX_backlog
-	mov	edx, MAX_backlog
+       @@:
+	mov	[eax + SOCKET.backlog], dx
-  .ok:
+	or	[eax + SOCKET.options], SO_ACCEPTCON
+	mov	[eax + TCP_SOCKET.t_state], TCB_LISTEN
-	mov	[eax + TCP_SOCKET.backlog], dx
+	push	eax
 	DEBUGF	1,"SOCKET_accept: socknum: %u sockaddr: %x, length: %u\n", ecx, edx, esi
 	call	SOCKET_num_to_ptr
 	jz	s_error
-	cmp	word [eax + SOCKET.Domain], AF_INET4
-	je	.af_inet4
+	test	[eax + SOCKET.options], SO_ACCEPTCON
+	jz	s_error
 	jmp	s_error
-  .af_inet4:
+	cmp	word [eax + SOCKET.Domain], AF_INET4
-	cmp	[eax + SOCKET.Protocol], IP_PROTO_TCP
-	je	.tcp
-	jmp	s_error
-  .tcp:
-	lea	ebx, [eax + SOCKET.lock]
-	call	wait_mutex
-	movzx	ebx, [eax + TCP_SOCKET.backlog_cur]
-	test	ebx, ebx
-	jz	.unlock_err
-	dec	[eax + TCP_SOCKET.backlog_cur]		    ;;;;
+	jne	s_error
+	cmp	[eax + SOCKET.Protocol], IP_PROTO_TCP
+	jne	s_error
-	mov	eax, [eax + TCP_SOCKET.end + (ebx-1)*4]      ;;;;;
+	get_from_queue (eax + SOCKET_QUEUE_LOCATION), MAX_backlog, 4, s_error
-	mov	[eax + SOCKET.lock], 0			       ;;;;
-	mov	dword [esp+32], 0				  ;;;;
-	call	TCP_output	;;;;;
-	ret
+	mov	eax, [esi]
 	call	SOCKET_ptr_to_num
-  .unlock_err:
+	jz	s_error
 	mov	[esp+32], eax
 	ret
-;align 4
+align 4
-;SOCKET_send_ip:
+SOCKET_send_ip:
-;
-;        DEBUGF  1,"type: IP\n"
+	DEBUGF	1,"type: IP\n"
-;
-;        mov     ecx, esi
+	mov	ecx, esi
-;        mov     esi, edx
+	mov	esi, edx
-;
-;        call    IPv4_output_raw
+	call	IPv4_output_raw
-;        mov     dword [esp+32], eax
+	mov	dword [esp+32], eax
-;        ret
+	ret
 ; eax = ptr to ring struct (just a buffer of the right size)
+;
 align 4
 SOCKET_ring_create:
 	push	esi
+	mov	esi, eax
-	mov	esi, eax
+	push	edx
+	stdcall create_ring_buffer, SOCKET_MAXDATA, PG_SW
-	stdcall create_ring_buffer, SOCKET_MAXDATA, PG_SW
+	pop	edx
 	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
-	add	eax,  SOCKET_MAXDATA
+	mov	eax, esi
-	mov	[esi + RING_BUFFER.end_ptr], eax
+	pop	esi
 	DEBUGF	1,"SOCKET_notify_owner: %x\n", eax
 	call	SOCKET_check
 	jz	.error
-	push	ecx esi
+	push	eax ecx esi
 	mov	[check_idle_semaphore], 200
 	DEBUGF	1,"SOCKET_notify_owner: succes!\n"
   .error2:
-	pop	esi ecx
+	pop	esi ecx eax
 ; set send-and receive procedures to return -1
 	mov	[eax + SOCKET.snd_proc], s_error
 	mov	[eax + SOCKET.rcv_proc], s_error
 ; find first free socket number and use it
-	xor	ecx, ecx
+	mov	ecx, [last_socket_num]
   .next_socket_number:
+	inc	ecx
+	jz	.next_socket_number	; avoid socket nr 0
+	cmp	ecx, -1
-	inc	ecx
+	je	.next_socket_number	; avoid socket nr -1
 	mov	ebx, net_sockets
   .next_socket:
 	mov	ebx, [ebx + SOCKET.NextPtr]
 	test	ebx, ebx
 	cmp	[ebx + SOCKET.Number], ecx
 	jne	.next_socket
 	jmp	.next_socket_number
+  .last_socket:
-  .last_socket:
+	mov	[last_socket_num], ecx
 	mov	[eax + SOCKET.Number], ecx
 	DEBUGF	1, "SOCKET_alloc: number=%u\n", ecx
 	mov	edi, ecx
 	DEBUGF	1, "SOCKET_free: success!\n"
   .error:
+	ret
+;------------------------------------
-	ret
+;
+; SOCKET_fork
+;
 ; Create a child socket
+;
-; IN:  socket nr in ebx
-; OUT: socket nr in eax
+; IN:  socket nr in ebx
+; OUT: child socket nr in eax
 ; preserves edx
 ;-----------------------------------
+align 4
+SOCKET_fork:
-align 4
-SOCKET_fork:
+	DEBUGF	1,"SOCKET_fork: %x\n", ebx
-;; Exit if backlog queue is full
+; Exit if backlog queue is full
-;        mov     ax, [ebx + TCP_SOCKET.backlog_cur]
+	mov	eax, [ebx + SOCKET_QUEUE_LOCATION + queue.size]
-;        cmp     ax, [ebx + TCP_SOCKET.backlog]
+	cmp	ax, [ebx + SOCKET.backlog]
-;        jae     .exit
+	jge	.fail
+; Allocate new socket
+	call	SOCKET_alloc
+	jz	.fail
+	push	esi ecx edi
+	push	eax
-; Allocate new socket
+	mov	esi, esp
-	call	SOCKET_alloc
+	add_to_queue (ebx + SOCKET_QUEUE_LOCATION), MAX_backlog, 4, .fail2
-     ;;;   jz      .fail
+	pop	eax
-; Copy structure from current socket to new, (including lock!)
+; Copy structure from current socket to new
-; We start at PID to reserve the socket num, and the 2 pointers at beginning of socket
+; We start at PID to preserve the socket num, and the 2 pointers at beginning of socket
-	lea	esi, [edx + SOCKET.PID]
+	lea	esi, [ebx + SOCKET.PID]
 	lea	edi, [eax + SOCKET.PID]
-	mov	ecx, (TCP_SOCKET.end - SOCKET.PID + 3)/4
+	mov	ecx, (SOCKET_QUEUE_LOCATION - SOCKET.PID + 3)/4
-	rep	movsd
+	rep	movsd
+	and	[eax + SOCKET.options], not SO_ACCEPTCON
+	call	SOCKET_notify_owner
+	pop	edi ecx esi
-;; Push pointer to new socket to queue
+	ret
 ;        movzx   ecx, [ebx + TCP_SOCKET.backlog_cur]

Subversion Repositories Kolibri OS

(root)/kernel/branches/net/network/socket.inc – Rev 1542 → 1543