Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 8026 → Rev 8025

/kernel/trunk/network/tcp_output.inc
32,7 → 32,7
 
locals
temp_bits db ?
rcv_window dd ?
window dd ?
endl
 
DEBUGF DEBUG_NETWORK_VERBOSE, "TCP_output: socket=%x state=%u\n", eax, [eax + TCP_SOCKET.t_state]
128,7 → 128,7
; If FIN has been sent, but not ACKed, but we havent been called to retransmit, esi will be -1
; Otherwise, window shrank after we sent into it.
 
jge .not_persist
jae .not_persist
 
; enter persist state
 
176,12 → 176,8
;-------------------------------
; calculate window advertisement
 
xor ecx, ecx
test [eax + SOCKET.state], SS_CANTRCVMORE
jnz @f
mov ecx, SOCKET_BUFFER_SIZE
sub ecx, [eax + STREAM_SOCKET.rcv.size]
@@:
 
;------------------------------
; Sender silly window avoidance
239,7 → 235,7
add ebx, [eax + TCP_SOCKET.RCV_NXT]
 
cmp ebx, ecx
jl @f
jb @f
mov ebx, ecx
@@:
 
250,8 → 246,9
cmp ebx, edi
jae .send
 
cmp ebx, SOCKET_BUFFER_SIZE/2
jae .send
shl ebx, 1
; cmp ebx, [eax + TCP_SOCKET.] ;;; TODO: check with receive buffer high water mark
; jae TCP_send
 
.no_window:
 
292,8 → 289,11
.enter_persist:
 
cmp [eax + STREAM_SOCKET.snd.size], 0 ; Data ready to send?
je @f
test [eax + TCP_SOCKET.timer_flags], timer_flag_retransmission or timer_flag_persist
jne @f
and [eax + TCP_SOCKET.timer_flags], not timer_flag_retransmission
jne @f
 
test [eax + TCP_SOCKET.timer_flags], timer_flag_persist ; Persist timer already expired?
jnz @f
 
DEBUGF DEBUG_NETWORK_VERBOSE, "TCP_output: Entering persist state\n"
485,31 → 485,21
; Calculate the receive window.
; Dont shrink window, but avoid silly window syndrome
 
xor ebx, ebx
test [eax + SOCKET.state], SS_CANTRCVMORE
jnz @f
mov ebx, SOCKET_BUFFER_SIZE
sub ebx, [eax + STREAM_SOCKET.rcv.size]
 
cmp ebx, SOCKET_BUFFER_SIZE/4
jge @f
jae @f
cmp ebx, [eax + TCP_SOCKET.t_maxseg]
jge @f
jae @f
xor ebx, ebx
@@:
 
 
mov cl, [eax + TCP_SOCKET.RCV_SCALE]
push eax
mov eax, TCP_max_win
shl eax, cl
cmp ebx, eax
jle @f
mov ebx, eax
cmp ebx, TCP_max_win ;;;; shl rcv_scale
jbe @f
mov ebx, TCP_max_win ;;;; shl rcv_scale
@@:
pop eax
 
 
mov ecx, [eax + TCP_SOCKET.RCV_ADV]
sub ecx, [eax + TCP_SOCKET.RCV_NXT]
cmp ebx, ecx
517,10 → 507,8
mov ebx, ecx
@@:
 
;; TODO URGENT POINTER
 
DEBUGF DEBUG_NETWORK_VERBOSE, "TCP_send: window=%u\n", ebx
mov [rcv_window], ebx
mov [window], ebx
 
mov cl, [eax + TCP_SOCKET.RCV_SCALE]
shr ebx, cl
680,7 → 668,7
 
; update advertised receive window
 
mov ecx, [rcv_window]
mov ecx, [window]
test ecx, ecx
jz @f
add ecx, [eax + TCP_SOCKET.RCV_NXT]