From: Fabian Keil Date: Sun, 27 Mar 2011 14:00:36 +0000 (+0000) Subject: In socks4_connect(), don't comment on connect_to() failures. X-Git-Tag: v_3_0_18~280 X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=commitdiff_plain;h=d9bb705e07183b219998642ce2812e6e5867046c In socks4_connect(), don't comment on connect_to() failures. The failures are dealt with when they happen now. --- diff --git a/gateway.c b/gateway.c index c6b6db0e..18601367 100644 --- a/gateway.c +++ b/gateway.c @@ -1,4 +1,4 @@ -const char gateway_rcs[] = "$Id: gateway.c,v 1.70 2011/02/19 13:55:57 fabiankeil Exp $"; +const char gateway_rcs[] = "$Id: gateway.c,v 1.71 2011/02/19 13:56:22 fabiankeil Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/gateway.c,v $ @@ -809,12 +809,8 @@ static jb_socket socks4_connect(const struct forward_spec * fwd, if (sfd == JB_INVALID_SOCKET) { - /* - * XXX: connect_to should fill in the exact reason. - * Most likely resolving the IP of the forwarder failed. - */ - errstr = "connect_to failed: see logfile for details"; - err = 1; + /* The error an its reason have already been logged by connect_to() */ + return(JB_INVALID_SOCKET); } else if (!data_is_available(sfd, csp->config->socket_timeout)) {