diff options
| author | Selva Nair | 2023-03-18 10:13:30 -0400 |
|---|---|---|
| committer | Gert Doering | 2023-03-20 18:38:26 +0100 |
| commit | c20a15844829a186b4d5256b0e8d76b8eb074845 (patch) | |
| tree | f2934de57fe859a53945ea0e135fcc8ed42180a5 | |
| parent | 973083746727cb797248262de56fb0a707bcdb90 (diff) | |
| download | openvpn-c20a15844829a186b4d5256b0e8d76b8eb074845.zip openvpn-c20a15844829a186b4d5256b0e8d76b8eb074845.tar.gz | |
Improve error message on short read from socks proxy
Change-Id: Id00006bf8ea705d02eff2cbfba7d841e1cdb6ae1
Signed-off-by: Selva Nair <selva.nair@gmail.com>
Acked-by: Gert Doering <gert@greenie.muc.de>
Message-Id: <20230318141330.1315235-1-selva.nair@gmail.com>
URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg26437.html
Signed-off-by: Gert Doering <gert@greenie.muc.de>
(cherry picked from commit 172640189277c940439d24fd31a59b8faffd0b3e)
| -rw-r--r-- | src/openvpn/socks.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/openvpn/socks.c b/src/openvpn/socks.c index 6a672c2..2cf0cc9 100644 --- a/src/openvpn/socks.c +++ b/src/openvpn/socks.c @@ -357,11 +357,16 @@ recv_socks_reply(socket_descriptor_t sd, size = recv(sd, &c, 1, MSG_NOSIGNAL); /* error? */ - if (size != 1) + if (size < 0) { msg(D_LINK_ERRORS | M_ERRNO, "recv_socks_reply: TCP port read failed on recv()"); return false; } + else if (size == 0) + { + msg(D_LINK_ERRORS, "ERROR: recv_socks_reply: empty response from socks server"); + return false; + } if (len == 3) { |