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

Bugfix of r1761

Browse Source 
git-svn-id: svn://kolibrios.org@1762 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
hidnplayr 2011-01-23 23:56:32 +00:00
parent e9daec20c8
commit 6af42a9b8e
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
kernel/branches/net/network/socket.inc
View File

@ -513,6 +513,8 @@ align 4
pop [eax + TCP_SOCKET.ISS] pop [eax + TCP_SOCKET.ISS]
mov [eax + TCP_SOCKET.timer_keepalive], TCP_time_keep_init mov [eax + TCP_SOCKET.timer_keepalive], TCP_time_keep_init
mov [eax + TCP_SOCKET.t_maxseg], 1480 ;;;;;
TCP_sendseqinit eax TCP_sendseqinit eax
; mov [ebx + TCP_SOCKET.timer_retransmission], ;; todo: create macro to set retransmission timer ; mov [ebx + TCP_SOCKET.timer_retransmission], ;; todo: create macro to set retransmission timer

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

@ -88,7 +88,7 @@ TCP_output:
; If FIN has been set, but not ACKed, but we havent been called to retransmit, esi will be -1 ; If FIN has been set, but not ACKed, but we havent been called to retransmit, esi will be -1
; Otherwise, window shrank after we sent into it. ; Otherwise, window shrank after we sent into it.
jnc .bigger_than_zero jns .not_negative
; enter persist state ; enter persist state
xor esi, esi xor esi, esi
@ -108,7 +108,7 @@ TCP_output:
; If window didn't close completely, just wait for an ACK ; If window didn't close completely, just wait for an ACK
.bigger_than_zero: .not_negative:
;--------------------------- ;---------------------------
; Send one segment at a time (124) ; Send one segment at a time (124)
@ -129,9 +129,7 @@ TCP_output:
add edi, esi add edi, esi
sub edi, [eax + TCP_SOCKET.SND_UNA] sub edi, [eax + TCP_SOCKET.SND_UNA]
sub edi, [eax + STREAM_SOCKET.snd + RING_BUFFER.size] sub edi, [eax + STREAM_SOCKET.snd + RING_BUFFER.size]
jns @f
cmp edi, 0
jge @f
and dl, not (TH_FIN) and dl, not (TH_FIN)