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

Fixed unlocking of mutex in TCP_output.

Browse Source 
git-svn-id: svn://kolibrios.org@3289 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
hidnplayr 2013-02-28 03:21:03 +00:00
parent 464a5aa65e
commit ba61873d0c
1 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
kernel/branches/net/network/tcp_output.inc
View File

@ -289,6 +289,8 @@ TCP_output:
call mutex_unlock call mutex_unlock
popa popa
; Fixme: returnvalue?
ret ret
@ -533,10 +535,6 @@ TCP_send:
TCP_checksum (eax + IP_SOCKET.LocalIP), (eax + IP_SOCKET.RemoteIP) TCP_checksum (eax + IP_SOCKET.LocalIP), (eax + IP_SOCKET.RemoteIP)
mov [esi + TCP_header.Checksum], dx mov [esi + TCP_header.Checksum], dx
; unlock socket
lea ecx, [eax + SOCKET.mutex]
call mutex_unlock
;---------------- ;----------------
; Send the packet ; Send the packet
@ -552,10 +550,6 @@ TCP_send:
inc [TCP_segments_tx] ; FIXME: correct interface? inc [TCP_segments_tx] ; FIXME: correct interface?
; unlock socket
lea ecx, [eax + SOCKET.mutex]
call mutex_lock
; update advertised receive window ; update advertised receive window
test ecx, ecx test ecx, ecx
jz @f jz @f
@ -572,12 +566,19 @@ TCP_send:
; and flags ; and flags
and [eax + TCP_SOCKET.t_flags], not (TF_ACKNOW + TF_DELACK) and [eax + TCP_SOCKET.t_flags], not (TF_ACKNOW + TF_DELACK)
test [eax + TCP_SOCKET.temp_bits], TCP_BIT_SENDALOT ;--------------
jnz TCP_output.again
; unlock socket ; unlock socket
push eax
lea ecx, [eax + SOCKET.mutex] lea ecx, [eax + SOCKET.mutex]
call mutex_unlock call mutex_unlock
pop eax
;-----------------------------
; Check if we need more output
test [eax + TCP_SOCKET.temp_bits], TCP_BIT_SENDALOT
jnz TCP_output.again
DEBUGF 1,"TCP_send: success!\n" DEBUGF 1,"TCP_send: success!\n"
@ -593,7 +594,6 @@ TCP_send:
mov [eax + TCP_SOCKET.timer_retransmission], TCP_time_re_min mov [eax + TCP_SOCKET.timer_retransmission], TCP_time_re_min
; unlock socket
lea ecx, [eax + SOCKET.mutex] lea ecx, [eax + SOCKET.mutex]
call mutex_unlock call mutex_unlock
@ -602,9 +602,13 @@ TCP_send:
or eax, -1 or eax, -1
ret ret
.send_error: .send_error:
add esp, 8 add esp, 8
lea ecx, [eax + SOCKET.mutex]
call mutex_unlock
DEBUGF 1,"TCP_send: sending failed\n" DEBUGF 1,"TCP_send: sending failed\n"
or eax, -2 or eax, -2