badpork/kolibrios
1
0
Fork 0
forked from KolibriOS/kolibrios
Code Pull Requests Activity

Socket functions now return error code in ebx (bugfix)

Browse Source 
git-svn-id: svn://kolibrios.org@3673 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
hidnplayr 2013-06-17 13:59:20 +00:00
parent a71e4b74cb
commit 3e004fd364
1 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
kernel/trunk/network/socket.inc
View File

@ -256,7 +256,7 @@ macro SOCKET_init {
align 4 align 4
sys_socket: sys_socket:
mov dword[esp+24], 0 ; Set error code to 0 mov dword[esp+20], 0 ; Set error code to 0
cmp ebx, 255 cmp ebx, 255
jz SOCKET_debug jz SOCKET_debug
@ -281,7 +281,7 @@ sys_socket:
.error: .error:
mov dword[esp+32], -1 mov dword[esp+32], -1
mov dword[esp+24], EINVAL mov dword[esp+20], EINVAL
ret ret
@ -342,12 +342,12 @@ SOCKET_open:
push eax push eax
call SOCKET_free call SOCKET_free
pop eax pop eax
mov dword[esp+24], EOPNOTSUPP mov dword[esp+20], EOPNOTSUPP
mov dword[esp+32], -1 mov dword[esp+32], -1
ret ret
.nobuffs: .nobuffs:
mov dword[esp+24], ENOBUFS mov dword[esp+20], ENOBUFS
mov dword[esp+32], -1 mov dword[esp+32], -1
ret ret
@ -429,12 +429,12 @@ SOCKET_bind:
je .af_local je .af_local
.notsupp: .notsupp:
mov dword[esp+24], EOPNOTSUPP mov dword[esp+20], EOPNOTSUPP
mov dword[esp+32], -1 mov dword[esp+32], -1
ret ret
.invalid: .invalid:
mov dword[esp+24], EINVAL mov dword[esp+20], EINVAL
mov dword[esp+32], -1 mov dword[esp+32], -1
ret ret
@ -477,7 +477,7 @@ SOCKET_bind:
.addrinuse: .addrinuse:
mov dword[esp+32], -1 mov dword[esp+32], -1
mov dword[esp+24], EADDRINUSE mov dword[esp+20], EADDRINUSE
ret ret
@ -508,12 +508,12 @@ SOCKET_connect:
je .af_inet4 je .af_inet4
.notsupp: .notsupp:
mov dword[esp+24], EOPNOTSUPP mov dword[esp+20], EOPNOTSUPP
mov dword[esp+32], -1 mov dword[esp+32], -1
ret ret
.invalid: .invalid:
mov dword[esp+24], EINVAL mov dword[esp+20], EINVAL
mov dword[esp+32], -1 mov dword[esp+32], -1
ret ret
@ -691,17 +691,17 @@ SOCKET_listen:
ret ret
.notsupp: .notsupp:
mov dword[esp+24], EOPNOTSUPP mov dword[esp+20], EOPNOTSUPP
mov dword[esp+32], -1 mov dword[esp+32], -1
ret ret
.invalid: .invalid:
mov dword[esp+24], EINVAL mov dword[esp+20], EINVAL
mov dword[esp+32], -1 mov dword[esp+32], -1
ret ret
.already: .already:
mov dword[esp+24], EALREADY mov dword[esp+20], EALREADY
mov dword[esp+32], -1 mov dword[esp+32], -1
ret ret
@ -760,17 +760,17 @@ SOCKET_accept:
jmp .loop jmp .loop
.wouldblock: .wouldblock:
mov dword[esp+24], EWOULDBLOCK mov dword[esp+20], EWOULDBLOCK
mov dword[esp+32], -1 mov dword[esp+32], -1
ret ret
.invalid: .invalid:
mov dword[esp+24], EINVAL mov dword[esp+20], EINVAL
mov dword[esp+32], -1 mov dword[esp+32], -1
ret ret
.notsupp: .notsupp:
mov dword[esp+24], EOPNOTSUPP mov dword[esp+20], EOPNOTSUPP
mov dword[esp+32], -1 mov dword[esp+32], -1
ret ret
@ -821,7 +821,7 @@ SOCKET_close:
.invalid: .invalid:
mov dword[esp+24], EINVAL mov dword[esp+20], EINVAL
mov dword[esp+32], -1 mov dword[esp+32], -1
ret ret
@ -847,13 +847,13 @@ SOCKET_receive:
call [eax + SOCKET.rcv_proc] call [eax + SOCKET.rcv_proc]
mov [esp+24], ebx mov [esp+20], ebx
mov [esp+32], eax mov [esp+32], eax
ret ret
.invalid: .invalid:
mov dword[esp+24], EINVAL mov dword[esp+20], EINVAL
mov dword[esp+32], -1 mov dword[esp+32], -1
ret ret
@ -1012,7 +1012,7 @@ SOCKET_send:
jmp [eax + SOCKET.snd_proc] jmp [eax + SOCKET.snd_proc]
.invalid: .invalid:
mov dword[esp+24], EINVAL mov dword[esp+20], EINVAL
mov dword[esp+32], -1 mov dword[esp+32], -1
ret ret
@ -1030,7 +1030,7 @@ SOCKET_send_udp:
.error: .error:
mov dword[esp+32], -1 mov dword[esp+32], -1
mov dword[esp+24], EMSGSIZE ; FIXME: UDP_output should return error codes! mov dword[esp+20], EMSGSIZE ; FIXME: UDP_output should return error codes!
ret ret
@ -1050,7 +1050,7 @@ SOCKET_send_tcp:
call TCP_output ; FIXME: this doesnt look pretty, does it? call TCP_output ; FIXME: this doesnt look pretty, does it?
pop eax pop eax
mov eax, [eax + SOCKET.errorcode] mov eax, [eax + SOCKET.errorcode]
mov [esp+24], eax mov [esp+20], eax
ret ret
@ -1067,7 +1067,7 @@ SOCKET_send_ip:
.error: .error:
mov dword[esp+32], -1 mov dword[esp+32], -1
mov dword[esp+24], EMSGSIZE mov dword[esp+20], EMSGSIZE
ret ret
@ -1084,7 +1084,7 @@ SOCKET_send_icmp:
.error: .error:
mov dword[esp+32], -1 mov dword[esp+32], -1
mov dword[esp+24], EMSGSIZE mov dword[esp+20], EMSGSIZE
ret ret
@ -1103,7 +1103,7 @@ SOCKET_send_pppoe:
.error: .error:
mov dword[esp+32], -1 mov dword[esp+32], -1
mov dword[esp+24], EMSGSIZE mov dword[esp+20], EMSGSIZE
ret ret
@ -1149,7 +1149,7 @@ SOCKET_send_local_:
.invalid: .invalid:
mov dword[esp+32], -1 mov dword[esp+32], -1
mov dword[esp+24], EINVAL mov dword[esp+20], EINVAL
ret ret
@ -1207,7 +1207,7 @@ SOCKET_get_opt:
.invalid: .invalid:
mov dword[esp+32], -1 mov dword[esp+32], -1
mov dword[esp+24], EINVAL mov dword[esp+20], EINVAL
ret ret
@ -1241,7 +1241,7 @@ SOCKET_set_opt:
.invalid: .invalid:
mov dword[esp+32], -1 mov dword[esp+32], -1
mov dword[esp+24], EINVAL mov dword[esp+20], EINVAL
ret ret
.bind: .bind:
@ -1284,7 +1284,7 @@ SOCKET_set_opt:
ret ret
.already: .already:
mov dword[esp+24], EALREADY mov dword[esp+20], EALREADY
mov dword[esp+32], -1 mov dword[esp+32], -1
ret ret
@ -1321,7 +1321,7 @@ SOCKET_pair:
call SOCKET_alloc call SOCKET_alloc
jz .nomem2 jz .nomem2
mov [esp+24], edi ; application's ebx mov [esp+20], edi ; application's ebx
mov [eax + SOCKET.Domain], AF_LOCAL mov [eax + SOCKET.Domain], AF_LOCAL
mov [eax + SOCKET.Type], SOCK_STREAM mov [eax + SOCKET.Type], SOCK_STREAM
@ -2045,7 +2045,7 @@ SOCKET_alloc:
ret ret
.not_yet: .not_yet:
mov dword[esp+24], ENOTCONN mov dword[esp+20], ENOTCONN
mov dword[esp+32], -1 mov dword[esp+32], -1
ret ret
@ -2540,6 +2540,6 @@ SOCKET_cant_send_more:
ret ret
.notconn: .notconn:
mov dword[esp+24], ENOTCONN mov dword[esp+20], ENOTCONN
mov dword[esp+32], -1 mov dword[esp+32], -1
ret ret