WebSVN – Kolibri OS – Diff – /programs/develop/libraries/network/network.asm

-	mov	[mem.alloc], eax
+        mov     [mem.alloc], eax
-	mov	[mem.free], ebx
+        mov     [mem.free], ebx
-	mov	[mem.realloc], ecx
+        mov     [mem.realloc], ecx
-	mov	[dll.load], edx
+        mov     [dll.load], edx
-	mov	[DNSrequestID], 1
+        mov     [DNSrequestID], 1
-	stdcall	edx, @IMPORT
+        xor     eax, eax
-	ret	4
+        ret
 ;;===========================================================================;;
 ;; in_addr_t __stdcall inet_addr(__in const char* hostname);                 ;;
 inet_addr:                                                                   ;;
-	mov	word [edi], si
+        mov     word [edi], si
-	add	edi, 2
+        add     edi, 2
-	ret
+        ret
 struct __gai_reqdata
-	socket	dd	?
+        socketnum  dd      ?
 ; external code should not look on rest of this structure,
 ; it is internal for getaddrinfo_start/process/abort
-	reqid		dw	?	; DNS request ID
+        reqid           dw      ?       ; DNS request ID
-	socktype	db	?	; SOCK_* or 0 for any
+        socktype        db      ?       ; SOCK_* or 0 for any
 ;;---------------------------------------------------------------------------;;
 ;? Get a list of IP addresses and port numbers for given host and service    ;;
 ;;---------------------------------------------------------------------------;;
 ;> first parameter (optional) = host name                                    ;;
 ;> second parameter (optional) = service name (decimal number for now)       ;;
-;> third parameter (optional) = hints for socket type                        ;;
+;> third parameter (optional) = hints for socketnum type                        ;;
 ;> fourth parameter = pointer to result (head of L1-list)                    ;;
 ;;---------------------------------------------------------------------------;;
 ;< eax = 0 on success / one of EAI_ codes on error                           ;;
 ;;===========================================================================;;
 ; 0. Save used registers for __stdcall.
-	push	EAI_FAMILY
+        push    EAI_FAMILY
-	pop	eax
+        pop     eax
-	jecxz	@f
+        jecxz   @f
-	cmp	[ecx+addrinfo.ai_family], edi
+        cmp     [ecx+addrinfo.ai_family], edi
-	jz	@f
+        jz      @f
-	cmp	[ecx+addrinfo.ai_family], PF_INET
+        cmp     [ecx+addrinfo.ai_family], AF_INET4
-	jnz	.ret
+        jnz     .ret
 @@:
 ; 1e. Valid combinations for ai_socktype/ai_protocol: 0/0 for any or
-;	SOCK_STREAM/IPPROTO_TCP, SOCK_DGRAM/IPPROTO_UDP
+;       SOCK_STREAM/IPPROTO_TCP, SOCK_DGRAM/IPPROTO_UDP
-;	(raw sockets are not yet supported by the kernel)
+;       (raw socketnums are not yet supported by the kernel)
-	xor	edx, edx	; assume 0=any if no hints
+        xor     edx, edx        ; assume 0=any if no hints
-	jecxz	.socket_type_ok
+        jecxz   .socketnum_type_ok
-	mov	edx, [ecx+addrinfo.ai_socktype]
+        mov     edx, [ecx+addrinfo.ai_socktype]
-	mov	esi, [ecx+addrinfo.ai_protocol]
+        mov     esi, [ecx+addrinfo.ai_protocol]
 ; 1f. Test for ai_socktype=0 and ai_protocol=0.
-	test	edx, edx
+        test    edx, edx
-	jnz	.check_socktype
+        jnz     .check_socktype
-	test	esi, esi
+        test    esi, esi
-	jz	.socket_type_ok
+        jz      .socketnum_type_ok
 ; 1g. ai_socktype=0, ai_protocol is nonzero.
-	push	EAI_SERVICE
+        push    EAI_SERVICE
-	pop	eax
+        pop     eax
-	inc	edx	; edx = SOCK_STREAM
+        inc     edx     ; edx = SOCK_STREAM
-	cmp	esi, IPPROTO_TCP
+        cmp     esi, IPPROTO_TCP
-	jz	.socket_type_ok
+        jz      .socketnum_type_ok
-	inc	edx	; edx = SOCK_DGRAM
+        inc     edx     ; edx = SOCK_DGRAM
-	cmp	esi, IPPROTO_UDP
+        cmp     esi, IPPROTO_UDP
-	jz	.socket_type_ok
+        jz      .socketnum_type_ok
 .ret:
 ; Restore saved registers, destroy stack frame and return.
-	mov	esp, ebp
+        mov     esp, ebp
-	pop	ebp
+        pop     ebp
-	pop	edi esi ebx
+        pop     edi esi ebx
-	cmp	edx, SOCK_STREAM
+        cmp     edx, SOCK_STREAM
-	jz	.check_tcp
+        jz      .check_tcp
-	cmp	edx, SOCK_DGRAM
+        cmp     edx, SOCK_DGRAM
-	jnz	.ret
+        jnz     .ret
-	test	esi, esi
+        test    esi, esi
-	jz	.socket_type_ok
+        jz      .socketnum_type_ok
-	cmp	esi, IPPROTO_UDP
+        cmp     esi, IPPROTO_UDP
-	jz	.socket_type_ok
+        jz      .socketnum_type_ok
-	jmp	.ret
+        jmp     .ret
 .check_tcp:
-	test	esi, esi
+        test    esi, esi
-	jz	.socket_type_ok
+        jz      .socketnum_type_ok
-	cmp	esi, IPPROTO_TCP
+        cmp     esi, IPPROTO_TCP
-	jnz	.ret
+        jnz     .ret
-.socket_type_ok:
+.socketnum_type_ok:
-	mov	[ebx+__gai_reqdata.socktype], dl
+        mov     [ebx+__gai_reqdata.socktype], dl
 ; 2. Resolve service.
 ; 2a. If no name is given, remember value -1.
-	push	-1
+        push    -1
-	pop	edx
+        pop     edx
 ; 2d. Save result to reqdata.
-	mov	[ebx+__gai_reqdata.service], edx
+        mov     [ebx+__gai_reqdata.service], edx
 ; 3. Process host name.
-	mov	esi, [.hostname]
+        mov     esi, [.hostname]
 ; 3a. If hostname is not given,
-;	use localhost for active sockets and INADDR_ANY for passive sockets.
+;       use localhost for active socketnums and INADDR_ANY for passive socketnums.
-	mov	eax, 0x0100007F	; 127.0.0.1 in network byte order
+        mov     eax, 0x0100007F ; 127.0.0.1 in network byte order
-	test	byte [ebx+__gai_reqdata.flags], AI_PASSIVE
+        test    byte [ebx+__gai_reqdata.flags], AI_PASSIVE
-	jz	@f
+        jz      @f
-	xor	eax, eax
+        xor     eax, eax
 @@:
-;	query class = IN (internet IPv4 address) = 1
+;       query class = IN (internet IPv4 address) = 1
 ; Note that network byte order is big-endian.
-	mov	eax, 0x01000100
+        mov     eax, 0x01000100
-	stosd
+        stosd
 ; 7. Get DNS server address.
+        mcall   76, API_IPv4 + 4 ; protocol IP=0, device number=0, function=get DNS address
-	mcall	52, 13
+        cmp     eax, -1
+        je      .ret.dnserr
-	xchg	esi, eax	; put server address to esi
+        mov     esi, eax        ; put server address to esi
-; 8. Open UDP socket to DNS server, port 53.
+; 8. Open UDP socketnum to DNS server, port 53.
+; 8a. Create new socketnum.
-	mcall	53, 0, 0, 53
+        mcall   75, 0, AF_INET4, SOCK_DGRAM
-	cmp	eax, -1	; error?
+        cmp     eax, -1 ; error?
-	jz	.ret.dnserr
+        jz      .ret.dnserr
-	xchg	ecx, eax	; put socket handle to ecx
+        mov     ecx, eax        ; put socketnum handle to ecx
+; 8b. Create sockaddr structure on the stack.
+        push    0
+        push    0       ; sin_zero
+        push    esi     ; sin_addr
+        push    AF_INET4 + (53 shl 24)
+                        ; sin_family and sin_port in network byte order
+; 8c. Connect.
+        mcall   75, 4, , esp, sizeof.sockaddr_in
+; 8d. Restore the stack, undo 8b.
+        add     esp, esi
+; 8e. Check result.
+        cmp     eax, -1
+        jz      .ret.close
 ; 9. Send DNS request packet.
-	sub	edi, esp	; get packet length
+        sub     edi, esp        ; get packet length
+        mov     esi, edi
-	mcall	53, 4, , edi, esp
+        xor     edi, edi
+        mcall   75, 6, , esp
-	cmp	eax, -1
+        cmp     eax, -1
-	jz	.ret.close
+        jz      .ret.close
-	mov	eax, [.reqdata]
+        mov     eax, [.reqdata]
-	mov	[eax+__gai_reqdata.socket], ecx
+        mov     [eax+__gai_reqdata.socketnum], ecx
-	push	-1
+        push    -1
-	pop	eax	; return status: more processing required
+        pop     eax     ; return status: more processing required
-	jmp	.ret.dns
+        jmp     .ret.dns
 .ret.close:
-	mcall	53, 1
+        mcall   75, 1
 .ret.dnserr:
-	push	EAI_AGAIN
+        push    EAI_AGAIN
-	pop	eax
+        pop     eax
 .ret.dns:
 ; 6. Restore stack pointer and return.
-	mov	edx, esp	; edx -> buffer for datagram
+        mov     edx, esp        ; edx -> buffer for datagram
 ; 1. Save used registers for __stdcall.
-	push	ebx esi edi
+        push    ebx esi edi
-	mov	edi, [.reqdata]
+        mov     edi, [.reqdata]
 ; 2. Read UDP datagram.
-	mov	ecx, [edi+__gai_reqdata.socket]
+        mov     ecx, [edi+__gai_reqdata.socketnum]
+        push    edi
-	mcall	53, 11, , , 512
+        mcall   75, 7, , , 512, 0
+        pop     edi
-; 3. Ignore events for other sockets (return if no data read)
+; 3. Ignore events for other socketnums (return if no data read)
-	test	eax, eax
+        test    eax, eax
-	jz	.ret.more_processing_required
+        jz      .ret.more_processing_required
 ; 4. Sanity check: discard too short packets.
-	xchg	ecx, eax	; save packet length in ecx
+        xchg    ecx, eax        ; save packet length in ecx
-	cmp	ecx, 12
+        cmp     ecx, 12
-	call	freeaddrinfo
+        call    freeaddrinfo
-	and	dword [esi], 0
+        and     dword [esi], 0
 @@:
-	pop	eax
+        pop     eax
 .ret.close:
-; 15. Close socket.
+; 15. Close socketnum.
-	push	eax
+        push    eax
-	mov	ecx, [.reqdata]
+        mov     ecx, [.reqdata]
-	mov	ecx, [ecx+__gai_reqdata.socket]
+        mov     ecx, [ecx+__gai_reqdata.socketnum]
-	mcall	53, 1
+        mcall   75, 1
-	pop	eax
+        pop     eax
 ; 16. Restore used registers, destroy stack frame and return.
 .ret:
-	pop	edi esi ebx
+        pop     edi esi ebx
-	mov	esp, ebp
+        mov     esp, ebp
-	rep	stosd
+        rep     stosd
-	pop	edi
+        pop     edi
 ; 4. Fill struct addrinfo.
-	mov	eax, [ebx+__gai_reqdata.flags]
+        mov     eax, [ebx+__gai_reqdata.flags]
-	mov	[edi+addrinfo.ai_flags], eax
+        mov     [edi+addrinfo.ai_flags], eax
-	mov	byte [edi+addrinfo.ai_family], PF_INET
+        mov     byte [edi+addrinfo.ai_family], AF_INET4
-	mov	byte [edi+addrinfo.ai_addrlen], sizeof.sockaddr_in
+        mov     byte [edi+addrinfo.ai_addrlen], sizeof.sockaddr_in
-	lea	ecx, [edi+sizeof.addrinfo]
+        lea     ecx, [edi+sizeof.addrinfo]
-	mov	[edi+addrinfo.ai_addr], ecx
+        mov     [edi+addrinfo.ai_addr], ecx
 ; 5. Fill struct sockaddr_in.
-	mov	byte [ecx+sockaddr_in.sin_len], sizeof.sockaddr_in
-	mov	byte [ecx+sockaddr_in.sin_family], PF_INET
+        mov     byte [ecx+sockaddr_in.sin_family], AF_INET4
-	pop	eax
+        pop     eax
-	mov	[ecx+sockaddr_in.sin_addr], eax
+        mov     [ecx+sockaddr_in.sin_addr], eax
 ; 6. Append new item to the list.
-	mov	[esi], edi
+        mov     [esi], edi
-	lea	esi, [edi+addrinfo.ai_next]
+        lea     esi, [edi+addrinfo.ai_next]
-	pop	eax
+        pop     eax
-	xor	esi, esi
+        xor     esi, esi
-	ret
+        ret
 .set_socktype:
-; Set ai_socktype and ai_protocol fields by given socket type.
+; Set ai_socktype and ai_protocol fields by given socketnum type.
-	mov	byte [edi+addrinfo.ai_socktype], cl
+        mov     byte [edi+addrinfo.ai_socktype], cl
-	dec	cl
+        dec     cl
-	jnz	.set_udp
+        jnz     .set_udp
 .set_tcp:
 .set_port:
 ; Just copy port from input __gai_reqdata to output addrinfo.
-	push	edx
+        push    edx
-	mov	edx, [ebx+__gai_reqdata.service]
+        mov     edx, [ebx+__gai_reqdata.service]
-	xchg	dl, dh	; convert to network byte order
+        xchg    dl, dh  ; convert to network byte order     ;;;;; CHECKME
-	mov	[edi+sizeof.addrinfo+sockaddr_in.sin_port], dx
+        mov     [edi+sizeof.addrinfo+sockaddr_in.sin_port], dx
-	pop	edx
+        pop     edx
-	ret
+        ret
 ;;---------------------------------------------------------------------------;;
 ;> first parameter = pointer to struct __gai_reqdata filled by ..._start     ;;
 ;;===========================================================================;;
 ; 0. Save used registers for __stdcall.
-	push	ebx
+        push    ebx
-; 1. Allocated resources: only socket, so close it and return.
+; 1. Allocated resources: only socketnum, so close it and return.
-	mov	eax, [esp+8]
+        mov     eax, [esp+8]
-	mov	ecx, [eax+__gai_reqdata.socket]
+        mov     ecx, [eax+__gai_reqdata.socketnum]
-	mcall	53, 1
+        mcall   75, 1
 ; 2. Restore used registers and return.
-	pop	ebx
+        pop     ebx
-	ret	4
+        ret     4
-	getaddrinfo_start	, 'getaddrinfo_start'	, \
+        getaddrinfo_start       , 'getaddrinfo_start'   , \
-	getaddrinfo_process	, 'getaddrinfo_process'	, \
+        getaddrinfo_process     , 'getaddrinfo_process' , \
-	getaddrinfo_abort	, 'getaddrinfo_abort'	, \
+        getaddrinfo_abort       , 'getaddrinfo_abort'   , \
-	freeaddrinfo		, 'freeaddrinfo'
+        freeaddrinfo            , 'freeaddrinfo'
-; import from libini
-align 4
-@IMPORT:
-library	libini, 'libini.obj'
-import	libini, \
-	ini.get_str, 'ini_get_str',	\
-	ini.get_int, 'ini_get_int'
 section '.data' data readable writable align 16
 ; uninitialized data
 mem.alloc   dd ?
 mem.free    dd ?

Subversion Repositories Kolibri OS

(root)/programs/develop/libraries/network/network.asm @ 6723 – Rev 1155 → 3545