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

data/Tupfile.lua

@@ -523,7 +523,6 @@ tup.append_table(img_files, {
  {"LIB/RASTERWORKS.OBJ", VAR_PROGS .. "/develop/libraries/fontRasterWorks_unicode/RasterWorks.obj"},
  {"LIB/SORT.OBJ", VAR_PROGS .. "/develop/libraries/sorter/sort.obj"},
  {"LIB/TINYGL.OBJ", VAR_PROGS .. "/develop/libraries/TinyGL/asm_fork/tinygl.obj"},
- {"LIB/XML.OBJ", VAR_PROGS .. "/develop/libraries/asm-xml/xml.obj"},
  {"MEDIA/ANIMAGE", VAR_PROGS .. "/media/animage/animage"},
  {"MEDIA/FILLSCR", VAR_PROGS .. "/media/FillScr/fillscr"},
  {"MEDIA/KIV", VAR_PROGS .. "/media/kiv/kiv"},

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/develop/libraries/asm-xml/LICENSE.txt

@@ -1,25 +0,0 @@
-Copyright (c) 2007-2012, Marc Kerbiquet
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice,
-   this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-3. Neither the name of AsmXml nor the names of its contributors may be
-   used to endorse or promote products derived from this software without
-   specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

programs/develop/libraries/asm-xml/Tupfile.lua

@@ -1,2 +0,0 @@
-if tup.getconfig("NO_FASM") ~= "" then return end
-tup.rule("xml.asm", "fasm %f %o " .. tup.getconfig("KPACK_CMD"), "xml.obj")

programs/develop/libraries/asm-xml/xml.asm

@@ -1,59 +0,0 @@
-; SPDX-License-Identifier: GPL-2.0-only
-;
-; xml.obj - AsmXml parser as a KolibriOS library
-; Copyright (C) KolibriOS team 2026
-;
-; asm-xml.asm and LICENSE.txt are the unmodified AsmXml 1.4 release
-; by Marc Kerbiquet (BSD 3-clause), https://tibleiz.net/asm-xml/
-
-format MS COFF
-
-public EXPORTS
-
-section '.flat' code readable align 16
-
-; AsmXml calls malloc/free as cdecl, the heap functions given to lib_init
-; are stdcall: the caller pops the argument they have already taken
-lib_init:
-        mov     [mem.alloc], eax
-        mov     [mem.free], ebx
-        mov     eax, malloc
-        mov     ebx, free
-        jmp     initialize
-
-malloc:
-        push    dword [esp + 4]
-        call    [mem.alloc]
-        ret
-
-free:
-        push    dword [esp + 4]
-        call    [mem.free]
-        ret
-
-align 4
-mem.alloc       dd ?
-mem.free        dd ?
-
-align 16
-EXPORTS:
-        dd      sz_lib_init,                    lib_init
-        dd      sz_initializeParser,            _initializeParser
-        dd      sz_releaseParser,               _releaseParser
-        dd      sz_parse,                       _parse
-        dd      sz_initializeClassParser,       _initializeClassParser
-        dd      sz_releaseClassParser,          _releaseClassParser
-        dd      sz_classFromElement,            _classFromElement
-        dd      sz_classFromString,             _classFromString
-        dd      0, 0
-
-sz_lib_init                     db 'lib_init', 0
-sz_initializeParser             db 'ax_initializeParser', 0
-sz_releaseParser                db 'ax_releaseParser', 0
-sz_parse                        db 'ax_parse', 0
-sz_initializeClassParser        db 'ax_initializeClassParser', 0
-sz_releaseClassParser           db 'ax_releaseClassParser', 0
-sz_classFromElement             db 'ax_classFromElement', 0
-sz_classFromString              db 'ax_classFromString', 0
-
-include 'asm-xml.asm'