-const char gateway_rcs[] = "$Id: gateway.c,v 1.68 2011/02/14 16:03:03 fabiankeil Exp $";
+const char gateway_rcs[] = "$Id: gateway.c,v 1.73 2011/04/19 13:00:47 fabiankeil Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/gateway.c,v $
int target_port,
struct client_state *csp);
-
-#define SOCKS_REQUEST_GRANTED 90
-#define SOCKS_REQUEST_REJECT 91
-#define SOCKS_REQUEST_IDENT_FAILED 92
-#define SOCKS_REQUEST_IDENT_CONFLICT 93
+enum {
+ SOCKS4_REQUEST_GRANTED = 90,
+ SOCKS4_REQUEST_REJECT = 91,
+ SOCKS4_REQUEST_IDENT_FAILED = 92,
+ SOCKS4_REQUEST_IDENT_CONFLICT = 93
+};
enum {
SOCKS5_REQUEST_GRANTED = 0,
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))
{
switch (s->cd)
{
- case SOCKS_REQUEST_GRANTED:
+ case SOCKS4_REQUEST_GRANTED:
return(sfd);
- case SOCKS_REQUEST_REJECT:
+ case SOCKS4_REQUEST_REJECT:
errstr = "SOCKS request rejected or failed.";
errno = EINVAL;
break;
- case SOCKS_REQUEST_IDENT_FAILED:
+ case SOCKS4_REQUEST_IDENT_FAILED:
errstr = "SOCKS request rejected because "
"SOCKS server cannot connect to identd on the client.";
errno = EACCES;
break;
- case SOCKS_REQUEST_IDENT_CONFLICT:
+ case SOCKS4_REQUEST_IDENT_CONFLICT:
errstr = "SOCKS request rejected because "
"the client program and identd report "
"different user-ids.";
{
errstr = "socks5 server unreachable";
log_error(LOG_LEVEL_CONNECT, "socks5_connect: %s", errstr);
+ /* Free the generic error message provided by connect_to() */
+ freez(csp->error_message);
csp->error_message = strdup(errstr);
return(JB_INVALID_SOCKET);
}
}
else if (server_size > 20)
{
- /* This is somewhat unexpected but doesn't realy matter. */
+ /* This is somewhat unexpected but doesn't really matter. */
log_error(LOG_LEVEL_CONNECT, "socks5_connect: read %d bytes "
"from socks server. Would have accepted up to %d.",
server_size, sizeof(sbuf));