Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 7679 → Rev 7680

/kernel/trunk/network/socket.inc
920,7 → 920,7
 
DEBUGF DEBUG_NETWORK_VERBOSE, "SOCKET_receive: STREAM\n"
 
cmp [eax + STREAM_SOCKET.rcv + RING_BUFFER.size], 0
cmp [eax + STREAM_SOCKET.rcv.size], 0
je .wouldblock
 
test edi, MSG_PEEK
936,7 → 936,7
call socket_ring_free ; free read memory
pop eax
 
cmp [eax + STREAM_SOCKET.rcv + RING_BUFFER.size], 0
cmp [eax + STREAM_SOCKET.rcv.size], 0
jne .more_data
xor ebx, ebx ; errorcode = 0 (no error)
ret
953,7 → 953,7
ret
 
.peek:
mov ecx, [eax + STREAM_SOCKET.rcv + RING_BUFFER.size]
mov ecx, [eax + STREAM_SOCKET.rcv.size]
xor ebx, ebx
ret
 
1561,7 → 1561,7
jmp socket_notify
 
.full:
DEBUGF DEBUG_NETWORK_VERBOSE, "SOCKET_input: socket %x is full!\n", eax
DEBUGF DEBUG_NETWORK_ERROR, "SOCKET_input: socket %x is full!\n", eax
 
pusha
lea ecx, [eax + SOCKET.mutex]
1657,7 → 1657,6
jb @f
sub edi, SOCKET_BUFFER_SIZE ; WRAP
@@:
 
mov [eax + RING_BUFFER.write_ptr], edi
pop edi
 
1753,7 → 1752,7
call mutex_unlock ; TODO: check what registers this function actually destroys
popa
 
DEBUGF DEBUG_NETWORK_VERBOSE, "SOCKET_ring_read: no data at all!\n"
DEBUGF DEBUG_NETWORK_ERROR, "SOCKET_ring_read: no data at all!\n"
xor ecx, ecx
ret
 
1800,7 → 1799,7
ret
 
.error: ; we could free all available bytes, but that would be stupid, i guess..
DEBUGF DEBUG_NETWORK_VERBOSE, "SOCKET_ring_free: buffer=%x error!\n", eax
DEBUGF DEBUG_NETWORK_ERROR, "SOCKET_ring_free: buffer=%x error!\n", eax
add [eax + RING_BUFFER.size], ecx
 
push eax
/kernel/trunk/network/tcp_output.inc
495,9 → 495,9
xor ebx, ebx
@@:
 
cmp ebx, TCP_max_win
cmp ebx, TCP_max_win ;;;; shl rcv_scale
jbe @f
mov ebx, TCP_max_win
mov ebx, TCP_max_win ;;;; shl rcv_scale
@@:
 
mov ecx, [eax + TCP_SOCKET.RCV_ADV]
/kernel/trunk/network/tcp_subr.inc
89,6 → 89,8
 
macro tcp_init_socket socket {
 
; new tcp control block
 
mov [socket + TCP_SOCKET.t_maxseg], TCP_mss_default
mov [socket + TCP_SOCKET.t_flags], TF_REQ_SCALE or TF_REQ_TSTMP