ace-dent/kolibrios-gitea
1
0
Fork 0
forked from KolibriOS/kolibrios
Code Pull Requests Activity

two small fixes

Browse Source 
git-svn-id: svn://kolibrios.org@6709 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
CleverMouse 2016-11-14 12:23:03 +00:00
parent 0048242452
commit 072fca2d28
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
programs/develop/libraries/network/network.asm
View File

@ -311,7 +311,6 @@ getaddrinfo: ;;
mcall 23 ; wait for event - must be stack event mcall 23 ; wait for event - must be stack event
; 2d. Check for timeout. ; 2d. Check for timeout.
test eax, eax test eax, eax
lea eax, [esp+4] ; pointer to (1)
jz .timeout jz .timeout
; 3. Got packet. Call processing function. ; 3. Got packet. Call processing function.
push edi ; second parameter: pointer to result push edi ; second parameter: pointer to result
@ -329,6 +328,7 @@ getaddrinfo: ;;
jbe .wait jbe .wait
.timeout: .timeout:
; 5. Timeout: abort and return error ; 5. Timeout: abort and return error
lea eax, [esp+4] ; pointer to (1)
push eax push eax
call getaddrinfo_abort call getaddrinfo_abort
and dword [edi], 0 and dword [edi], 0
@ -678,17 +678,18 @@ lock xadd [DNSrequestID], eax ; atomically increment ID, get old value
mcall 76, API_IPv4 + (1 shl 8) + 4 ; protocol IP=0, device number=0, function=get DNS address mcall 76, API_IPv4 + (1 shl 8) + 4 ; protocol IP=0, device number=0, function=get DNS address
cmp eax, -1 cmp eax, -1
je .ret.dnserr je .ret.dnserr
mov esi, eax ; put server address to esi push eax ; save server address to the stack
; 8. Open UDP socketnum to DNS server, port 53. ; 8. Open UDP socketnum to DNS server, port 53.
; 8a. Create new socketnum. ; 8a. Create new socketnum.
mcall 75, 0, AF_INET4, SOCK_DGRAM mcall 75, 0, AF_INET4, SOCK_DGRAM, 0
pop esi ; restore server address saved at step 7
cmp eax, -1 ; error? cmp eax, -1 ; error?
jz .ret.dnserr jz .ret.dnserr
mov ecx, eax ; put socketnum handle to ecx mov ecx, eax ; put socketnum handle to ecx
; 8b. Create sockaddr structure on the stack. ; 8b. Create sockaddr structure on the stack.
push 0 push 0
push 0 ; sin_zero push 0 ; sin_zero
push esi ; sin_addr push edi ; sin_addr
push AF_INET4 + (53 shl 24) push AF_INET4 + (53 shl 24)
; sin_family and sin_port in network byte order ; sin_family and sin_port in network byte order
; 8c. Connect. ; 8c. Connect.