X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=gateway.c;h=b65991acf83e11cbfe4c4cf79972d7052214d109;hp=de24572384784dbf51b24ab7758748b5167b7bb7;hb=43f5258489643f42346c27d440f6353cda2838d2;hpb=4e07c90604ddcd82e971cc96a1d66dea934b18c7 diff --git a/gateway.c b/gateway.c index de245723..b65991ac 100644 --- a/gateway.c +++ b/gateway.c @@ -1,4 +1,4 @@ -const char gateway_rcs[] = "$Id: gateway.c,v 1.79 2011/10/16 12:37:12 fabiankeil Exp $"; +const char gateway_rcs[] = "$Id: gateway.c,v 1.81 2011/10/23 11:21:09 fabiankeil Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/gateway.c,v $ @@ -1093,10 +1093,8 @@ static jb_socket socks5_connect(const struct forward_spec *fwd, if (server_size != sizeof(sbuf)) { errstr = "SOCKS5 negotiation read failed"; - err = 1; } - - if (!err) + else { if (sbuf[0] != '\x05') { @@ -1118,7 +1116,7 @@ static jb_socket socks5_connect(const struct forward_spec *fwd, assert(errstr != NULL); csp->error_message = strdup(errstr); - log_error(LOG_LEVEL_CONNECT, "socks5_connect: %s", errstr); + log_error(LOG_LEVEL_CONNECT, "socks5_connect: %s: %N", errstr, server_size, sbuf); close_socket(sfd); errno = EINVAL;