From 52893d0ce31cd7dfaecd877770522b57f2e2fff9 Mon Sep 17 00:00:00 2001 From: hidnplayr Date: Wed, 5 Jun 2013 00:53:57 +0000 Subject: [PATCH] More timer bugfixes for TCP_output. git-svn-id: svn://kolibrios.org@3603 a494cfbc-eb01-0410-851d-a64ba20cac60 --- kernel/trunk/network/IPv4.inc | 4 ++-- kernel/trunk/network/tcp_output.inc | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/kernel/trunk/network/IPv4.inc b/kernel/trunk/network/IPv4.inc index d192b98aec..02495fe5cf 100644 --- a/kernel/trunk/network/IPv4.inc +++ b/kernel/trunk/network/IPv4.inc @@ -618,13 +618,13 @@ IPv4_output: ret .eth_error: - DEBUGF DEBUG_NETWORK_VERBOSE, "IPv4_output: ethernet error\n" + DEBUGF DEBUG_NETWORK_ERROR, "IPv4_output: ethernet error\n" add esp, 3*4+2+6 xor edi, edi ret .arp_error: - DEBUGF DEBUG_NETWORK_VERBOSE, "IPv4_output: ARP error=%x\n", eax + DEBUGF DEBUG_NETWORK_ERROR, "IPv4_output: ARP error=%x\n", eax add esp, 3*4+2 xor edi, edi ret diff --git a/kernel/trunk/network/tcp_output.inc b/kernel/trunk/network/tcp_output.inc index 9d91943b14..df752c43e6 100644 --- a/kernel/trunk/network/tcp_output.inc +++ b/kernel/trunk/network/tcp_output.inc @@ -93,7 +93,7 @@ TCP_output: jmp .no_force .no_zero_window: - and [ebx + TCP_SOCKET.timer_flags], not timer_flag_persist + and [eax + TCP_SOCKET.timer_flags], not timer_flag_persist mov [eax + TCP_SOCKET.t_rxtshift], 0 .no_force: @@ -125,7 +125,7 @@ TCP_output: jnz @f ; cancel pending retransmit - and [ebx + TCP_SOCKET.timer_flags], not timer_flag_retransmission + and [eax + TCP_SOCKET.timer_flags], not timer_flag_retransmission ; pull SND_NXT back to (closed) window, We will enter persist state below. push [eax + TCP_SOCKET.SND_UNA] @@ -268,10 +268,10 @@ TCP_output: cmp [eax + STREAM_SOCKET.snd.size], 0 ; Data ready to send? jne @f - and [ebx + TCP_SOCKET.timer_flags], not timer_flag_retransmission + and [eax + TCP_SOCKET.timer_flags], not timer_flag_retransmission jne @f - test [ebx + TCP_SOCKET.timer_flags], timer_flag_persist ; Persist timer already expired? + 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" @@ -521,11 +521,11 @@ TCP_send: mov edx, [eax + TCP_SOCKET.t_rxtcur] mov [eax + TCP_SOCKET.timer_retransmission], edx - or [ebx + TCP_SOCKET.timer_flags], timer_flag_retransmission + or [eax + TCP_SOCKET.timer_flags], timer_flag_retransmission test [eax + TCP_SOCKET.timer_flags], timer_flag_persist jz .retransmit_set - and [ebx + TCP_SOCKET.timer_flags], not timer_flag_persist + and [eax + TCP_SOCKET.timer_flags], not timer_flag_persist mov [eax + TCP_SOCKET.t_rxtshift], 0 .retransmit_set: