kernel/net: raise the TCP connect timeout to 10 s

data/Tupfile.lua

@@ -166,7 +166,6 @@ extra_files = {
  {"kolibrios/demos/rpento.lif", "common/demos/rpento.lif"},
  {"kolibrios/develop/fpc/", "common/develop/fpc/*"},
  {"kolibrios/develop/fpc/examples/", "../programs/develop/fp/examples/src/*"},
- {"kolibrios/develop/fasm/fasm.txt", SRC_PROGS .. "/develop/fasm/1.73/fasm.txt"},
  {"kolibrios/develop/oberon07/compiler.kex", SRC_PROGS .. "/develop/oberon07/Compiler.kex"},
  {"kolibrios/develop/oberon07/LICENSE", SRC_PROGS .. "/develop/oberon07/LICENSE"},
  {"kolibrios/develop/oberon07/doc/CC.txt", SRC_PROGS .. "/develop/oberon07/doc/CC.txt"},

data/ru_RU/docs/guide/guide.htm

@@ -20,13 +20,13 @@
 <a href="hardware_support.htm">Поддержка оборудования</a>
 
 <strong>Разработка</strong>
-<a href="/sys/docpack|d">Справочник по системным функциям Колибри</a>
-<a href="/sys/docpack|c">Использование отладчика</a>
-<a href="/kolibrios/develop/fasm/fasm.txt">Руководство FASM</a>
+<a href="/sys/docpack|f">Справочник по системным функциям Колибри</a>
+<a href="/sys/docpack|e">Использование отладчика</a>
+<a href="/sys/docpack|d">Руководство FASM</a>
 
 <strong>Использование библиотек</strong>
-<a href="/sys/docpack|g">Ini</a>
-<a href="/sys/docpack|h">Диалог открытия файла OpenDial</a>
+<a href="/sys/docpack|i">Ini</a>
+<a href="/sys/docpack|j">Диалог открытия файла OpenDial</a>
 
 <strong>Смотрите также</strong>
 Вики проекта <a href="http://wiki.kolibrios.org/">wiki.kolibrios.org</a>

kernel/trunk/network/tcp.inc

@@ -72,7 +72,7 @@ TCP_time_rtt_default    = 5           ; default Round Trip Time (3,2s)
 TCP_time_srtt_default   = 0           ;
 TCP_time_max_idle       = 8*TCP_time_keep_interval      ; FIXME
 
-TCP_time_connect        = 300         ; in 1/100s (default=3s)
+TCP_time_connect        = 1000        ; in 1/100s (default=10s)
 
 ; timer constants
 TCP_max_rxtshift        = 12          ; max retransmissions waiting for ACK

kernel/trunk/network/tcp_input.inc

@@ -399,6 +399,7 @@ endl
         bswap   eax
         mov     [ebx + TCP_SOCKET.ts_val], eax
         lodsd                                   ; timestamp echo reply
+        bswap   eax
         mov     [ebx + TCP_SOCKET.ts_ecr], eax
         or      [temp_bits], TCP_BIT_TIMESTAMP
 
@@ -978,7 +979,7 @@ endl
 
         inc     [ebx + TCP_SOCKET.t_dupacks]
         cmp     [ebx + TCP_SOCKET.t_dupacks], TCP_re_xmit_thresh
-        jb      .dup_ack_complete
+        jb      .ack_processed
         ja      .another_lost
 
         DEBUGF  DEBUG_NETWORK_VERBOSE, "TCP_input: Re-transmitting lost segment\n"

kernel/trunk/network/tcp_output.inc

@@ -391,8 +391,14 @@ endl
         jz      .no_timestamp
 
   .timestamp:
-        pushd   0
-        pushd   [timer_ticks]
+        push    ebx
+        mov     ebx, [eax + TCP_SOCKET.ts_recent]
+        bswap   ebx
+        xchg    ebx, [esp]                      ; TSecr
+        push    ebx
+        mov     ebx, [timer_ticks]
+        bswap   ebx
+        xchg    ebx, [esp]                      ; TSval
         pushd   TCP_OPT_NOP + TCP_OPT_NOP shl 8 + TCP_OPT_TIMESTAMP shl 16 + 10 shl 24
         add     di, 12
 
@@ -413,10 +419,12 @@ endl
 ; check if we don't exceed the max segment size
 
         add     esi, edi                        ; total TCP segment size
-        cmp     esi, [eax + TCP_SOCKET.t_maxseg]
+        mov     ebx, [eax + TCP_SOCKET.t_maxseg]
+        add     ebx, sizeof.TCP_header          ; MSS does not count the header
+        cmp     esi, ebx
         jbe     .no_overflow
 
-        mov     esi, [eax + TCP_SOCKET.t_maxseg]
+        mov     esi, ebx
         or      [temp_bits], TCP_BIT_SENDALOT
   .no_overflow:
 

programs/system/docpack/Tupfile.lua

@@ -15,6 +15,9 @@ then tup.append_table(deps,
 else tup.append_table(deps,
   tup.rule("../../../kernel/trunk/docs/sysfuncs.txt", cp_cmd, "SysFuncs.txt"))
 end
+tup.append_table(deps,
+  tup.rule("../../develop/fasm/1.73/fasm.txt", cp_cmd, "Fasm.txt")
+)
 tup.append_table(deps,
   tup.rule("../../../kernel/trunk/docs/stack.txt", cp_cmd, "Stack.txt")
 )

programs/system/docpack/docpack.asm

@@ -9,7 +9,7 @@
 ;---------------------------------------------------------------------
 
 FILE_COUNT=0
-DEF_FILE equ 'f'
+DEF_FILE equ 'g'
 
 macro embed_docdir_file fn
 {
@@ -197,17 +197,18 @@ embedded:
 
   embed_docdir_file 'Copying.txt'      ;a
   embed_docdir_file 'Hot_Keys.txt'     ;b
-  embed_docdir_file 'Mtdbg.txt'        ;c
+  embed_local_file 'Fasm.txt'          ;c
+  embed_docdir_file 'Mtdbg.txt'        ;d
 if lang eq ru_RU
-  embed_local_file  'SysFuncr.txt'     ;d
+  embed_local_file 'SysFuncr.txt'      ;e
 else ; Default to en_US
-  embed_local_file  'SysFuncs.txt'     ;d
+  embed_local_file 'SysFuncs.txt'      ;e
 end if
-  embed_local_file  'Stack.txt'        ;e
-  embed_docdir_file 'KFAR_Keys.txt'    ;f
-  embed_docdir_file 'INI.txt'          ;g
-  embed_docdir_file 'OpenDial.txt'     ;h
-  embed_docdir_file 'Credits.txt'      ;i
+  embed_local_file 'Stack.txt'         ;f
+  embed_docdir_file 'KFAR_Keys.txt'    ;g
+  embed_docdir_file 'INI.txt'          ;h
+  embed_docdir_file 'OpenDial.txt'     ;i
+  embed_docdir_file 'Credits.txt'      ;j
 ; -- End of embedding area  -------
 
   dd 0