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

 ;;         GNU GENERAL PUBLIC LICENSE                              ;;
 ;;          Version 2, June 1991                                   ;;
 ;;                                                                 ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-$Revision: 1541 $
+$Revision: 1542 $
 virtual at 0
 virtual at IP_SOCKET.end
 	TCP_SOCKET:
-	.LocalPort		dw ? ; In INET byte order
+	.LocalPort		dw ?
-	.RemotePort		dw ? ; In INET byte order
+	.RemotePort		dw ?
 virtual at IP_SOCKET.end
 	UDP_SOCKET:
-	.LocalPort		dw ? ; In INET byte order
+	.LocalPort		dw ?
-	.RemotePort		dw ? ; In INET byte order
+	.RemotePort		dw ?
 	.firstpacket		db ?
 	.end:
 end virtual
 virtual at IP_SOCKET.end
 ; Socket API (function 74)
+;
 ;-----------------------------------------------------------------
 align 4
 sys_socket:
-	cmp	ebx, 8		; highest possible number
+	cmp	ebx, 9		; highest possible number
 	jg	@f
-	lea	ebx, [sock_sysfn_table + 4*ebx]
+	jmp	dword [sock_sysfn_table + 4*ebx]
-	jmp	dword [ebx]
        @@:
 	cmp	ebx, 255
 	jz	SOCKET_debug
 	dd	SOCKET_listen	; 3
 	dd	SOCKET_connect	; 4
 	dd	SOCKET_accept	; 5
 	dd	SOCKET_send	; 6
 	dd	SOCKET_receive	; 7
-	dd	SOCKET_get_opt	; 8
+	dd	SOCKET_set_opt	; 8
-;        dd      SOCKET_set_opt  ; 9
+	dd	SOCKET_get_opt	; 9
 ;-----------------------------------------------------------------
+;
 ; SOCKET_open
 	DEBUGF	1,"SOCKET_open: domain: %u, type: %u protocol: %x\n", ecx, edx, esi
 	call	SOCKET_alloc
+	jz	s_error
-	jz	s_error
+	mov	[esp+32], edi			; return socketnumber
 	mov	[eax + SOCKET.Domain], ecx
-	mov	[eax + SOCKET.Type], edx
-	mov	[eax + SOCKET.Protocol], esi
 	mov	[eax + SOCKET.Type], edx
-	mov	[esp+32], edi			; return socketnumber
+	mov	[eax + SOCKET.Protocol], esi
 	cmp	ecx, AF_INET4
-	jne	.no_inet4
-	push	[IP_LIST]
+	jne	.no_inet4
 	pop	[eax + IP_SOCKET.LocalIP]	; fill in local ip number
+	push	[IP_LIST]
-	call	SOCKET_find_port		; fill in a local port number, application may change it later, or use this one
+	pop	[eax + IP_SOCKET.LocalIP]	; fill in local ip number
-	cmp	edx, IP_PROTO_UDP
+	cmp	edx, SOCK_DGRAM
 	je	.udp
+	cmp	edx, SOCK_STREAM
-	cmp	edx, IP_PROTO_TCP
+	je	.tcp
-	je	.tcp
+	cmp	edx, SOCK_RAW
+	je	.raw
-	cmp	edx, SOCK_RAW
-	je	.raw
+  .no_inet4:
+	ret
-  .no_inet4:
-	ret
+align 4
   .raw:
+;        test    esi, esi       ; IP_PROTO_IP
-  .tcp:
+;        jz      .ip
+	cmp	esi, IP_PROTO_ICMP
+	je	.icmp
-	mov	ebx, eax
+	cmp	esi, IP_PROTO_UDP
 	je	.udp
 	lea	eax, [ebx + STREAM_SOCKET.snd]
-	call	SOCKET_ring_create
+	cmp	esi, IP_PROTO_TCP
 	je	.tcp
 	lea	eax, [ebx + STREAM_SOCKET.rcv]
+	ret
-	call	SOCKET_ring_create
+align 4
-	mov	[ebx + SOCKET.snd_proc], SOCKET_send_tcp
+  .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
-	mov	[ebx + SOCKET.rcv_proc], SOCKET_receive_tcp
+	push	eax
+	init_queue (eax + SOCKET_QUEUE_LOCATION)
+	pop	eax
+	mov	[eax + SOCKET.snd_proc], SOCKET_send_udp
+	mov	[eax + SOCKET.rcv_proc], SOCKET_receive_dgram
 	ret
+align 4
   .tcp:
+	mov	[eax + SOCKET.Protocol], IP_PROTO_TCP
   .udp:
-	push	eax
+	call	SOCKET_find_port		; fill in a local port number, application may change it later, or use this one
 	init_queue (eax + SOCKET_QUEUE_LOCATION)
-	pop	eax
+	mov	ebx, eax
-	mov	[eax + SOCKET.snd_proc], SOCKET_send_udp
+	lea	eax, [ebx + STREAM_SOCKET.snd]
-	mov	[eax + SOCKET.rcv_proc], SOCKET_receive_dgram
+	call	SOCKET_ring_create
+	lea	eax, [ebx + STREAM_SOCKET.rcv]
+	call	SOCKET_ring_create
 	ret
+	mov	[ebx + SOCKET.snd_proc], SOCKET_send_tcp
 	mov	[ebx + SOCKET.rcv_proc], SOCKET_receive_tcp
   .raw:
-;        test    esi, esi
+	ret
 ;        jz      .ip
 	DEBUGF	1,"af_inet4\n"
 	cmp	esi, 6
-	jl	s_error
-	mov	ecx, [eax + SOCKET.Type]
+	jl	s_error
 	mov	bx, word [edx + 2]
 	test	bx, bx
 	jmp	s_error
   .af_inet4:
-	cmp	[eax + SOCKET.Type], IP_PROTO_UDP
+	cmp	[eax + SOCKET.Protocol], IP_PROTO_UDP
 	je	.udp
+	cmp	[eax + SOCKET.Protocol], IP_PROTO_TCP
+	je	.tcp
-	cmp	[eax + SOCKET.Type], IP_PROTO_TCP
+	cmp	[eax + SOCKET.Protocol], IP_PROTO_IP
+	je	.ip
 	je	.tcp
 	cmp	[eax + SOCKET.Protocol], IP_PROTO_ICMP
-	cmp	[eax + SOCKET.Type], SOCK_RAW
+	je	.ip
 	je	.raw
 	jmp	s_error
 	DEBUGF	1,"remote ip: %u.%u.%u.%u\n",[edx+4]:1,[edx+5]:1,[edx+6]:1,[edx+7]:1
 	mov	dword [esp+32], 0
 	ret
 align 4
   .tcp:
 	lea	ebx, [eax + SOCKET.lock]
 	mov	[eax + SOCKET.lock], 0
 	mov	dword [esp+32], 0	; success!
+	ret
-	ret
 align 4
-  .raw:
+  .ip:
 	push	dword [edx + 4]
 	pop	dword [eax + IP_SOCKET.RemoteIP]
 	jz	s_error
 	cmp	word [eax + SOCKET.Domain], AF_INET4
 	jne	s_error
-	cmp	[eax + SOCKET.Type], IP_PROTO_TCP
+	cmp	[eax + SOCKET.Protocol], IP_PROTO_TCP
 	jne	s_error
 	mov	edx, MAX_backlog
   .ok:
 	mov	[eax + TCP_SOCKET.backlog], dx
 	mov	[eax + TCP_SOCKET.t_state], TCB_LISTEN
-	 or	[eax + SOCKET.options], SO_ACCEPTCON
+	 or	[eax + SOCKET.options], SO_ACCEPTCON		;;;; TODO: set socket state to listen
 	jmp	s_error
   .af_inet4:
-	cmp	[eax + SOCKET.Type], IP_PROTO_TCP
+	cmp	[eax + SOCKET.Protocol], IP_PROTO_TCP
 	jz	s_error
 	cmp	[eax + SOCKET.Domain], AF_INET4
 	jne	s_error
-	cmp	[eax + SOCKET.Type], IP_PROTO_UDP
+	cmp	[eax + SOCKET.Protocol], IP_PROTO_UDP
 	je	.free
+	cmp	[eax + SOCKET.Protocol], IP_PROTO_ICMP
+	je	.free
-	cmp	[eax + SOCKET.Type], IP_PROTO_ICMP
+	cmp	[eax + SOCKET.Protocol], IP_PROTO_IP
 	je	.free
 	mov	dword [esp+32], 0
 	ret
+align 4
+SOCKET_set_opt:
+	ret
 ;-----------------------------------------------------------------
+;
 	DEBUGF	1,"SOCKET_find_port\n"
 	push	ebx esi ecx
-	cmp	[eax + SOCKET.Type], IP_PROTO_UDP
+	cmp	[eax + SOCKET.Protocol], IP_PROTO_UDP
 	je	.udp
 ;-----------------------------------------------------------------
+;
-; SOCKET_check_port
+; SOCKET_check_port (to be used with AF_INET only!)
+;
 ; Checks if a local port number is unused
 align 4
 SOCKET_check_port:
 	DEBUGF	1,"SOCKET_check_port\n"
-	mov	ecx, [eax + SOCKET.Type]
+	mov	ecx, [eax + SOCKET.Protocol]
 	mov	esi, net_sockets
   .next_socket:
 	mov	esi, [esi + SOCKET.NextPtr]
 	or	esi, esi
 	jz	.port_ok
 	DEBUGF	1, "SOCKET_free: freeing socket..\n"
 	cmp	[eax + SOCKET.Domain], AF_INET4
 	jnz	.no_tcp
-	cmp	[eax + SOCKET.Type], IP_PROTO_TCP
+	cmp	[eax + SOCKET.Protocol], IP_PROTO_TCP
 	jnz	.no_tcp
 	DEBUGF	1,"closing socket %x", eax, ebx
 	mov	[ebx + SOCKET.PID], 0
-	cmp	[ebx + SOCKET.Type], IP_PROTO_UDP
+	cmp	[ebx + SOCKET.Protocol], IP_PROTO_UDP
 	je	.udp

Subversion Repositories Kolibri OS

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