From eaebc59a11805990101fe4a143256c50b5aa9747 Mon Sep 17 00:00:00 2001 From: hidnplayr Date: Tue, 28 Aug 2012 19:44:27 +0000 Subject: [PATCH] Enabled Requesting scale and timestamp by default. git-svn-id: svn://kolibrios.org@2953 a494cfbc-eb01-0410-851d-a64ba20cac60 --- kernel/branches/net/network/socket.inc | 1 - kernel/branches/net/network/tcp.inc | 2 ++ kernel/branches/net/network/tcp_subr.inc | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/kernel/branches/net/network/socket.inc b/kernel/branches/net/network/socket.inc index 41fb31bf29..b4deeb5bc0 100644 --- a/kernel/branches/net/network/socket.inc +++ b/kernel/branches/net/network/socket.inc @@ -897,7 +897,6 @@ SOCKET_send_pppoe: mov [esp+32], ecx mov ebx, [eax + SOCKET.device] - mov ecx, esi call PPPoE_discovery_output cmp eax, -1 je s_error diff --git a/kernel/branches/net/network/tcp.inc b/kernel/branches/net/network/tcp.inc index a0015b3a7f..05188c6980 100644 --- a/kernel/branches/net/network/tcp.inc +++ b/kernel/branches/net/network/tcp.inc @@ -54,6 +54,8 @@ TCP_OPT_EOL = 0 ; End of option list. TCP_OPT_NOP = 1 ; No-Operation. TCP_OPT_MAXSEG = 2 ; Maximum Segment Size. TCP_OPT_WINDOW = 3 ; window scale +TCP_OPT_SACK_PERMIT = 4 ; Selective Acknowledgement +TCP_OPT_SACK = 5 TCP_OPT_TIMESTAMP = 8 ; Fundamental timer values diff --git a/kernel/branches/net/network/tcp_subr.inc b/kernel/branches/net/network/tcp_subr.inc index 208fa94b52..eb0bada8b2 100644 --- a/kernel/branches/net/network/tcp_subr.inc +++ b/kernel/branches/net/network/tcp_subr.inc @@ -85,7 +85,7 @@ macro TCP_rcvseqinit ptr { macro TCP_init_socket socket { mov [socket + TCP_SOCKET.t_maxseg], TCP_mss_default - mov [socket + TCP_SOCKET.t_flags], 0 ; we could also request scale and timestamp + mov [socket + TCP_SOCKET.t_flags], TF_REQ_SCALE or TF_REQ_TSTMP mov [socket + TCP_SOCKET.t_srtt], TCP_time_srtt_default mov [socket + TCP_SOCKET.t_rttvar], TCP_time_rtt_default * 4