Took me long enough, but now it's in :-) - thanks, and thanks ValdikSS
for reporting test success.

I've run this on the server side test bed (which will not excercise SOCKS
paths, but to verify that "nothing unrelated got hit") and on the client,
with a few SOCKs proxy tests.  These are all "fast proxies" so do not
excercise the new timeout handling - and I did not find time to build
something with dummynet to make it actually test on a "really slow proxy".

Testing using an unreachable IP didn't yield proper results (because
the TCP connect is still goverened by the "base" timeout), so you
need something which answers TCP/1080, and then "is slow"...

Testing using a "dead" netcat 'socks server' ("nc -k -l 1080") leads to

  - old code: give up after 5 seconds ("TCP port read timeout"), always
  - new code: respect --connect-timeout (shorter or longer than 5s)

Your patch has been applied to the master and release/2.6 branch
(I consider it a bugfix, and while the code touches a few places, it
only really changes very localized socks.c code).

commit b3a68b85a729628ca8b97f9f0c2813f795289cfc (master)
commit 94bfb712366ece1ca3605d18e99580f482f0232b (release/2.6)
Author: 5andr0
Date:   Fri Mar 15 17:20:11 2024 +0100

     Implement server_poll_timeout for socks

     Signed-off-by: 5andr0 <sandro.tria...@gmail.com>
     Acked-by: Frank Lichtenheld <fr...@lichtenheld.com>
     Message-Id: <20240315162011.1661139-1-fr...@lichtenheld.com>
     URL: 
https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg28408.html
     Signed-off-by: Gert Doering <g...@greenie.muc.de>


--
kind regards,

Gert Doering



_______________________________________________
Openvpn-devel mailing list
Openvpn-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openvpn-devel

Reply via email to