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

 ;;         GNU GENERAL PUBLIC LICENSE                              ;;
 ;;          Version 2, June 1991                                   ;;
 ;;                                                                 ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-$Revision: 1534 $
+$Revision: 1536 $
 virtual at 0
 	.errorcode		dd ?
 	.options		dd ?
+	.state			dd ?
+	.snd_proc		dd ?
-	.state			dd ?
+	.rcv_proc		dd ?
 	.end:
 	DEBUGF	1,"socket error\n"
 	mov	dword [esp+32], -1
+	ret
 	ret
 align 4
 sock_sysfn_table:
 	dd	SOCKET_open	; 0
 	dd	SOCKET_close	; 1
+;
 ;-----------------------------------------------------------------
 align 4
 SOCKET_open:
-	DEBUGF	1,"socket_open: domain: %u, type: %u protocol: %x\n", ecx, edx, esi
+	DEBUGF	1,"SOCKET_open: domain: %u, type: %u protocol: %x\n", ecx, edx, esi
 	call	SOCKET_alloc
 	jz	s_error
 	mov	[eax + SOCKET.Domain], ecx
 	mov	[eax + SOCKET.Type], edx
 	mov	[eax + SOCKET.Protocol], esi
+	mov	[esp+32], edi			; return socketnumber
+	cmp	ecx, AF_INET4
+	jne	.no_inet4
-	mov	[esp+32], edi
+	push	[IP_LIST]
 	pop	[eax + IP_SOCKET.LocalIP]	; fill in local ip number
-	cmp	ecx, AF_INET4
+	call	SOCKET_find_port		; fill in a local port number, application may change it later, or use this one
+	cmp	edx, IP_PROTO_UDP
+	je	.udp
 	jnz	.no_stream
 	cmp	edx, IP_PROTO_TCP
-	push	[IP_LIST]		  ;;;;
+	je	.tcp
 	pop	[eax + IP_SOCKET.LocalIP] ;;;;
   .no_inet4:
-	cmp	edx, IP_PROTO_TCP
+	ret
-	jnz	.no_stream
+  .tcp:
+	mov	ebx, eax
-	mov	ebx, eax
+	lea	eax, [ebx + STREAM_SOCKET.snd]
+	call	SOCKET_ring_create
+	lea	eax, [ebx + STREAM_SOCKET.rcv]
+	call	SOCKET_ring_create
 	lea	eax, [ebx + STREAM_SOCKET.snd]
 	mov	ecx, [eax + SOCKET.Type]
 	mov	bx, word [edx + 2]
 	test	bx, bx
-	jz	.find_free
-	call	SOCKET_check_port
-;        test    bx, bx
-	jz	s_error
-	jmp	.got_port
-    .find_free:
+	jz	.use_preset_port
-	call	SOCKET_find_port
 ;        test    bx, bx
-	jz	s_error
+	call	SOCKET_check_port
+	jz	s_error
 	DEBUGF	1,"using local port: %u\n", bx
-    .got_port:
+	mov	word [eax + UDP_SOCKET.LocalPort], bx
 	DEBUGF	1,"using local port: %u\n", bx
-	mov	word [eax + UDP_SOCKET.LocalPort], bx
+  .use_preset_port:
 	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
-	cmp	[eax + TCP_SOCKET.LocalPort], 0
-	jne	@f
-	call	SOCKET_find_port
-       @@:
-	DEBUGF	1,"local port: %u\n", [eax + TCP_SOCKET.LocalPort]:2
+	mov	[eax + IP_SOCKET.RemoteIP], ebx
 ;;;;;
 	mov	[eax + TCP_SOCKET.timer_persist], 0
 	mov	[eax + TCP_SOCKET.t_state], TCB_SYN_SENT
 	movzx	ebx, [eax + TCP_SOCKET.backlog_cur]
 	test	ebx, ebx
 	jz	.unlock_err
-	dec	[eax + TCP_SOCKET.backlog_cur]
+	dec	[eax + TCP_SOCKET.backlog_cur]		    ;;;;
-	mov	eax, [eax + TCP_SOCKET.end + (ebx-1)*4]
+	mov	eax, [eax + TCP_SOCKET.end + (ebx-1)*4]      ;;;;;
-	mov	[eax + SOCKET.lock], 0
+	mov	[eax + SOCKET.lock], 0			       ;;;;
-	mov	dword [esp+32], 0
+	mov	dword [esp+32], 0				  ;;;;
 	je	.tcp
 	jmp	s_error
   .tcp:
-	test	[eax + TCP_SOCKET.t_state], TCB_SYN_RECEIVED  ;;;;;;
-	jz	.free
+	cmp	[eax + TCP_SOCKET.t_state], TCB_SYN_RECEIVED	; state must be LISTEN, SYN_SENT or CLOSED
+	jl	.free
-  ;;;      call    TCP_output
-  ;;;      mov     dword [esp+32], 0
 	call	TCP_output
-  ;;;      ret
+	mov	dword [esp+32], 0
-;       state must be LISTEN, SYN_SENT, CLOSED or maybe even invalid
+	ret
+;
 ;-----------------------------------------------------------------
 align 4
 SOCKET_receive:
-	DEBUGF	1,"socket_receive: socknum: %u bufaddr: %x, buflength: %u, flags: %x\n", ecx, edx, esi, edi
+	DEBUGF	1,"SOCKET_receive: socknum: %u bufaddr: %x, buflength: %u, flags: %x, ", ecx, edx, esi, edi
 	call	SOCKET_num_to_ptr
-	jz	s_error
-	cmp	[eax + SOCKET.Type], IP_PROTO_TCP	;;;;;;;;
-	je	.tcp
-	mov	ebx, esi
-	get_from_queue (eax + SOCKET_QUEUE_LOCATION),\
+	jz	s_error
+	jmp	[eax + SOCKET.rcv_proc]
+align 4
-		       SOCKET_QUEUE_SIZE,\
+SOCKET_receive_udp:
+	DEBUGF	1,"type: UDP\n"
 		       socket_queue_entry.size,\
-		       s_error
+	mov	ebx, esi
-		       ; destroys esi and ecx
+	mov	edi, edx					; addr to buffer
-	mov	edi, edx					; addr to buffer
-	mov	ecx, [esi + socket_queue_entry.data_size]
-	DEBUGF	1,"Got %u bytes of data\n", ecx
+	get_from_queue (eax + SOCKET_QUEUE_LOCATION), SOCKET_QUEUE_SIZE, socket_queue_entry.size, s_error	; destroys esi and ecx
-	cmp	ecx, ebx
+	mov	ecx, [esi + socket_queue_entry.data_size]
-	jle	.large_enough
+	DEBUGF	1,"Got %u bytes of data\n", ecx
 	DEBUGF	1,"Buffer too small...\n"
-	jmp	s_error
+	cmp	ecx, ebx
 	jg	.too_small
   .large_enough:
+	push	[esi + socket_queue_entry.buf_ptr]		; save the buffer addr so we can clear it later
-	push	[esi + socket_queue_entry.buf_ptr]	       ; save the buffer addr so we can clear it later
+	mov	esi, [esi + socket_queue_entry.data_ptr]
-	mov	esi, [esi + socket_queue_entry.data_ptr]
+	DEBUGF	1,"Source buffer: %x, real addr: %x\n", [esp], esi
-	DEBUGF	1,"Source buffer: %x, real addr: %x\n", [esp], esi
+	mov	dword[esp+32+4], ecx				; return number of bytes copied
-	mov	dword[esp+32+4], ecx				; return number of bytes copied in ebx
+; copy the data
 	shr	ecx, 1
-; copy the data
+	jnc	.nb
-	shr	ecx, 1
+	movsb
-	jnc	.nb
-	movsb
+  .nb:
-.nb:	shr	ecx, 1
+	shr	ecx, 1
 	jnc	.nw
+	movsw
+  .nw:
+	test	ecx, ecx
+	jz	.nd
+	rep	movsd
+  .nd:
+	call	kernel_free					; remove the packet
-	movsw
+	ret
 .nw:	test	ecx, ecx
-	jz	.nd
+  .too_small:
 	rep	movsd
-.nd:
+	DEBUGF	1,"Buffer too small...\n"
-; remove the packet     ;;; TODO: only if it is empty!!
+	jmp	s_error
-	call	kernel_free
+align 4
+;
 ;-----------------------------------------------------------------
 align 4
 SOCKET_send:
-	DEBUGF	1,"socket_send: socknum: %u sockaddr: %x, length: %u, flags: %x\n", ecx, edx, esi, edi
+	DEBUGF	1,"SOCKET_send: socknum: %u sockaddr: %x, length: %u, flags: %x, ", ecx, edx, esi, edi
 	call	SOCKET_num_to_ptr
-	jz	s_error
-	cmp	word [eax + SOCKET.Domain], AF_INET4
-	je	.af_inet4
-	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
-       @@:
+	jz	s_error
-	cmp	[eax + SOCKET.Type], IP_PROTO_TCP
-	je	.tcp
 	jmp	[eax + SOCKET.snd_proc]
-	cmp	[eax + SOCKET.Type], IP_PROTO_UDP
-	je	.udp
-	jmp	s_error
-  .udp:
-	DEBUGF	1,"type: UDP\n"
-; check if local port is valid
 	cmp	[eax + UDP_SOCKET.LocalPort], 0
 	jne	@f
-	call	SOCKET_find_port
+align 4
-	jz	s_error
+SOCKET_send_udp:
-; Now, send the packet
-     @@:
-	mov	ecx, esi
-	mov	esi, edx
-	call	UDP_output
+	DEBUGF	1,"type: UDP\n"
-	mov	dword [esp+32], 0
-	ret
+	mov	ecx, esi
 	mov	esi, edx
   .tcp:
-	DEBUGF	1,"type: TCP\n"
+	call	UDP_output
-; check if local port is valid
+	mov	dword [esp+32], 0
+	ret
 	cmp	[eax + TCP_SOCKET.LocalPort], 0
 	jne	@f
 align 4
+;
 ;-----------------------------------------------------------------
 align 4
 SOCKET_get_opt:
-	DEBUGF	1,"socket_get_opt\n"
+	DEBUGF	1,"SOCKET_get_opt\n"
 	call	SOCKET_num_to_ptr
+;
 ;-----------------------------------------------------------------
 align 4
 SOCKET_find_port:
-	DEBUGF	1,"socket_find_free_port\n"
+	DEBUGF	1,"SOCKET_find_port\n"
 	push	ebx esi ecx
+;
 ;-----------------------------------------------------------------
 align 4
 SOCKET_check_port:
-	DEBUGF	1,"socket_check_port\n"
+	DEBUGF	1,"SOCKET_check_port\n"
 	mov	ecx, [eax + SOCKET.Type]
 ;-----------------------------------------------------------------
+;
 ; SOCKET_input
 ;
-; Updates a socket with received data
+; Updates a (stateless) socket with received data
+;
 ; Note: the mutex should already be set !
+;
 ;  IN:  eax = socket ptr
+;
 ;-----------------------------------------------------------------
 align 4
 SOCKET_input:
-	DEBUGF	1,"socket_input: socket=%x, data=%x size=%u\n", eax, esi, ecx
+	DEBUGF	1,"SOCKET_input: socket=%x, data=%x size=%u\n", eax, esi, ecx
 	mov	dword[esp+4], ecx
 	push	esi
-	mov	esi, esp
-	add_to_queue (eax + SOCKET_QUEUE_LOCATION),\
-		     SOCKET_QUEUE_SIZE,\
+	mov	esi, esp
 		     socket_queue_entry.size,\
-		     SOCKET_input.full
+	add_to_queue (eax + SOCKET_QUEUE_LOCATION), SOCKET_QUEUE_SIZE, socket_queue_entry.size, SOCKET_input.full
+;
 ;-----------------------------------------------------------------
 align 4
 SOCKET_ring_free:
-	DEBUGF	1,"Trying to free %u bytes of data from ring %x\n", ecx, eax
+	DEBUGF	1,"SOCKET_ring_free: %u bytes from ring %x\n", ecx, eax
 	sub	[eax + RING_BUFFER.size], ecx
+;
 ;-----------------------------------------------------------------
 align 4
 SOCKET_notify_owner:
-	DEBUGF	1,"socket_notify_owner\n"
+	DEBUGF	1,"SOCKET_notify_owner: %x\n", eax
 	call	SOCKET_check
 	jz	.error
-	push	ecx eax esi
+	push	ecx esi
        .found_pid:
 	shl	ecx, 8
 	or	[ecx + SLOT_BASE + APPDATA.event_mask], EVENT_NETWORK
 	mov	[check_idle_semaphore], 200
-	DEBUGF	1,"owner notified\n"
+	DEBUGF	1,"SOCKET_notify_owner: succes!\n"
+  .error2:
-  .error2:
+	pop	esi ecx
 	pop	esi eax ecx
 	mov	ecx, SOCKETBUFFSIZE / 4
 	xor	eax, eax
 	rep	stosd
 	pop	edi 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
-	mov	ebx, net_sockets
+; find first free socket number and use it
 	xor	ecx, ecx
   .next_socket_number:
+	inc	ecx
-	inc	ecx
+	mov	ebx, net_sockets
   .next_socket:
 	mov	ebx, [ebx + SOCKET.NextPtr]
 	test	ebx, ebx
+	jz	.last_socket
 	jz	.last_socket
 	cmp	[ebx + SOCKET.Number], ecx
-	jne	.next_socket
-	mov	ebx, net_sockets
+	jne	.next_socket
 	jmp	.next_socket_number
   .last_socket:
 	jz	@f
 	add	ebx, SOCKET.lock	; lock the next socket
 	call	wait_mutex
 	sub	ebx, SOCKET.lock
 	mov	[ebx + SOCKET.PrevPtr], eax
-	mov	[ebx + SOCKET.lock], 0
+	mov	[ebx + SOCKET.lock], 0	; and unlock it again
        @@:
 	mov	[net_sockets + SOCKET.NextPtr], eax
 	or	eax, eax		; used to clear zero flag
+;
 ;----------------------------------------------------
 align 4
 SOCKET_free:
-	DEBUGF	1, "socket_free: %x\n", eax
+	DEBUGF	1, "SOCKET_free: %x\n", eax
 	call	SOCKET_check
 	call	wait_mutex
 	DEBUGF	1, "freeing socket..\n"
 	cmp	[eax + SOCKET.Domain], AF_INET4
-	jnz	.no_stream
+	jnz	.no_tcp
+	cmp	[eax + SOCKET.Type], IP_PROTO_TCP
-	cmp	[eax + SOCKET.Type], IP_PROTO_TCP
+	jnz	.no_tcp
-	jnz	.no_stream
+	mov	ebx, eax
 	stdcall kernel_free, [ebx + STREAM_SOCKET.rcv + RING_BUFFER.start_ptr]
-	stdcall kernel_free, [eax + STREAM_SOCKET.rcv + RING_BUFFER.start_ptr]
+	stdcall kernel_free, [ebx + STREAM_SOCKET.snd + RING_BUFFER.start_ptr]
-	stdcall kernel_free, [eax + STREAM_SOCKET.snd + RING_BUFFER.start_ptr]
+	mov	eax, ebx
+;
 ;---------------------------------------------------
 align 4
 SOCKET_num_to_ptr:
-	DEBUGF	1,"socket_num_to_ptr: %u ", ecx
+	DEBUGF	1,"SOCKET_num_to_ptr: %u ", ecx
 	mov	eax, net_sockets
+;
 ;---------------------------------------------------
 align 4
 SOCKET_ptr_to_num:
-	DEBUGF	1,"socket_ptr_to_num: %x ", eax
+	DEBUGF	1,"SOCKET_ptr_to_num: %x ", eax
 	call	SOCKET_check
+;
 ;---------------------------------------------------
 align 4
 SOCKET_check:
-	DEBUGF	1,"socket_check\n"
+	DEBUGF	1,"SOCKET_check: %x\n", eax
 	push	ebx
+;
 ;---------------------------------------------------
 align 4
 SOCKET_check_owner:
-	DEBUGF	1,"socket_check_owner\n"
+	DEBUGF	1,"SOCKET_check_owner: %x\n", eax
 	push	ebx
 	mov	ebx, [TASK_BASE]
+;
 ;------------------------------------------------------
 align 4
 SOCKET_process_end:
-	DEBUGF	1,"socket_process_end: %x\n", eax
+	DEBUGF	1,"SOCKET_process_end: %x\n", eax
 	push	ebx

Subversion Repositories Kolibri OS

(root)/kernel/branches/net/network/socket.inc – Rev 1534 → 1536