BlueGreycalmElegant

Català-Valencià – Catalan中文 – Chinese (Simplified)中文 – Chinese (Traditional)Česky – CzechDansk – DanishNederlands – DutchEnglish – EnglishSuomi – FinnishFrançais – FrenchDeutsch – Germanעברית – Hebrewहिंदी – HindiMagyar – HungarianBahasa Indonesia – IndonesianItaliano – Italian日本語 – Japanese한국어 – KoreanМакедонски – Macedonianमराठी – MarathiNorsk – NorwegianPolski – PolishPortuguês – PortuguesePortuguês – Portuguese (Brazil)Русский – RussianSlovenčina – SlovakSlovenščina – SlovenianEspañol – SpanishSvenska – SwedishTürkçe – TurkishУкраїнська – UkrainianOëzbekcha – Uzbek

Compare Revisions

• This comparison shows the changes necessary to convert path

  → /kernel/ @ 4019

  → /kernel/ @ 4020

  ↔ Reverse comparison

• Compare Path:	Rev

  With Path:	Rev

Regard whitespace Rev 4019 → Rev 4020

/kernel/trunk/network/socket.inc
608,22 → 608,32
.block:
test [eax + SOCKET.options], SO_NONBLOCK
jz .loop
jz .waitforit
mov dword[esp+20], EWOULDBLOCK
mov dword[esp+32], -1
ret
.waitforit:
push eax
stdcall timer_hs, 300, 0, .wake, eax ; FIXME: make timeout a constant
pop eax
.loop:
cmp [eax + TCP_SOCKET.t_state], TCPS_CLOSED
je .fail
cmp [eax + SOCKET.errorcode], 0
jne .fail
cmp [eax + TCP_SOCKET.t_state], TCPS_ESTABLISHED
je .established
ja .fail
call SOCKET_block
jmp .loop
.wake:
mov eax, [esp+4]
mov [eax + SOCKET.errorcode], ETIMEDOUT
call SOCKET_notify.unblock
ret 4
.fail:
mov eax, [eax + SOCKET.errorcode]
mov [esp+20], eax