projects
/
privoxy.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
correct feedback channels
[privoxy.git]
/
gateway.c
diff --git
a/gateway.c
b/gateway.c
index
2ad02c5
..
7d67ff0
100644
(file)
--- a/
gateway.c
+++ b/
gateway.c
@@
-1,4
+1,4
@@
-const char gateway_rcs[] = "$Id: gateway.c,v 1.
9 2001/10/25 03:40:48 david__schmidt
Exp $";
+const char gateway_rcs[] = "$Id: gateway.c,v 1.
11 2002/03/08 17:46:04 jongfoster
Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/gateway.c,v $
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/gateway.c,v $
@@
-34,6
+34,13
@@
const char gateway_rcs[] = "$Id: gateway.c,v 1.9 2001/10/25 03:40:48 david__schm
*
* Revisions :
* $Log: gateway.c,v $
*
* Revisions :
* $Log: gateway.c,v $
+ * Revision 1.11 2002/03/08 17:46:04 jongfoster
+ * Fixing int/size_t warnings
+ *
+ * Revision 1.10 2002/03/07 03:50:19 oes
+ * - Improved handling of failed DNS lookups
+ * - Fixed compiler warnings
+ *
* Revision 1.9 2001/10/25 03:40:48 david__schmidt
* Change in porting tactics: OS/2's EMX porting layer doesn't allow multiple
* threads to call select() simultaneously. So, it's time to do a real, live,
* Revision 1.9 2001/10/25 03:40:48 david__schmidt
* Change in porting tactics: OS/2's EMX porting layer doesn't allow multiple
* threads to call select() simultaneously. So, it's time to do a real, live,
@@
-109,10
+116,10
@@
const char gateway_rcs[] = "$Id: gateway.c,v 1.9 2001/10/25 03:40:48 david__schm
const char gateway_h_rcs[] = GATEWAY_H_VERSION;
const char gateway_h_rcs[] = GATEWAY_H_VERSION;
-static
in
t socks4_connect(const struct forward_spec * fwd,
- const char * target_host,
- int target_port,
- struct client_state *csp);
+static
jb_socke
t socks4_connect(const struct forward_spec * fwd,
+
const char * target_host,
+
int target_port,
+
struct client_state *csp);
#define SOCKS_REQUEST_GRANTED 90
#define SOCKS_REQUEST_GRANTED 90
@@
-156,9
+163,9
@@
static const char socks_userid[] = "anonymous";
* Returns : -1 => failure, else it is the socket file descriptor.
*
*********************************************************************/
* Returns : -1 => failure, else it is the socket file descriptor.
*
*********************************************************************/
-
in
t forwarded_connect(const struct forward_spec * fwd,
- struct http_request *http,
- struct client_state *csp)
+
jb_socke
t forwarded_connect(const struct forward_spec * fwd,
+
struct http_request *http,
+
struct client_state *csp)
{
const char * dest_host;
int dest_port;
{
const char * dest_host;
int dest_port;
@@
-191,7
+198,7
@@
int forwarded_connect(const struct forward_spec * fwd,
/* Should never get here */
log_error(LOG_LEVEL_FATAL, "SOCKS4 impossible internal error - bad SOCKS type.");
errno = EINVAL;
/* Should never get here */
log_error(LOG_LEVEL_FATAL, "SOCKS4 impossible internal error - bad SOCKS type.");
errno = EINVAL;
- return(
-1
);
+ return(
JB_INVALID_SOCKET
);
}
}
}
}
@@
-214,19
+221,19
@@
int forwarded_connect(const struct forward_spec * fwd,
* Returns : -1 => failure, else a socket file descriptor.
*
*********************************************************************/
* Returns : -1 => failure, else a socket file descriptor.
*
*********************************************************************/
-static
in
t socks4_connect(const struct forward_spec * fwd,
- const char * target_host,
- int target_port,
- struct client_state *csp)
+static
jb_socke
t socks4_connect(const struct forward_spec * fwd,
+
const char * target_host,
+
int target_port,
+
struct client_state *csp)
{
int web_server_addr;
char cbuf[BUFFER_SIZE];
char sbuf[BUFFER_SIZE];
struct socks_op *c = (struct socks_op *)cbuf;
struct socks_reply *s = (struct socks_reply *)sbuf;
{
int web_server_addr;
char cbuf[BUFFER_SIZE];
char sbuf[BUFFER_SIZE];
struct socks_op *c = (struct socks_op *)cbuf;
struct socks_reply *s = (struct socks_reply *)sbuf;
-
in
t n;
+
size_
t n;
size_t csiz;
size_t csiz;
-
in
t sfd;
+
jb_socke
t sfd;
int err = 0;
char *errstr;
int err = 0;
char *errstr;
@@
-245,7
+252,7
@@
static int socks4_connect(const struct forward_spec * fwd,
if (err)
{
errno = EINVAL;
if (err)
{
errno = EINVAL;
- return(
-1
);
+ return(
JB_INVALID_SOCKET
);
}
/* build a socks request for connection to the web server */
}
/* build a socks request for connection to the web server */
@@
-261,7
+268,7
@@
static int socks4_connect(const struct forward_spec * fwd,
if (web_server_addr == INADDR_NONE)
{
log_error(LOG_LEVEL_CONNECT, "socks4_connect: could not resolve target host %s", target_host);
if (web_server_addr == INADDR_NONE)
{
log_error(LOG_LEVEL_CONNECT, "socks4_connect: could not resolve target host %s", target_host);
- return(
-1
);
+ return(
JB_INVALID_SOCKET
);
}
break;
case SOCKS_4A:
}
break;
case SOCKS_4A:
@@
-270,7
+277,7
@@
static int socks4_connect(const struct forward_spec * fwd,
if (n > sizeof(cbuf))
{
errno = EINVAL;
if (n > sizeof(cbuf))
{
errno = EINVAL;
- return(
-1
);
+ return(
JB_INVALID_SOCKET
);
}
strcpy(cbuf + csiz, target_host);
csiz = n;
}
strcpy(cbuf + csiz, target_host);
csiz = n;
@@
-279,7
+286,7
@@
static int socks4_connect(const struct forward_spec * fwd,
/* Should never get here */
log_error(LOG_LEVEL_FATAL, "SOCKS4 impossible internal error - bad SOCKS type.");
errno = EINVAL;
/* Should never get here */
log_error(LOG_LEVEL_FATAL, "SOCKS4 impossible internal error - bad SOCKS type.");
errno = EINVAL;
- return(
-1
);
+ return(
JB_INVALID_SOCKET
);
}
c->vn = 4;
}
c->vn = 4;
@@
-294,23
+301,23
@@
static int socks4_connect(const struct forward_spec * fwd,
/* pass the request to the socks server */
sfd = connect_to(fwd->gateway_host, fwd->gateway_port, csp);
/* pass the request to the socks server */
sfd = connect_to(fwd->gateway_host, fwd->gateway_port, csp);
- if (sfd
< 0
)
+ if (sfd
== JB_INVALID_SOCKET
)
{
{
- return(
-1
);
+ return(
JB_INVALID_SOCKET
);
}
}
- if (
(n = write_socket(sfd, (char *)c, csiz)) != csiz
)
+ if (
write_socket(sfd, (char *)c, (int)csiz)
)
{
log_error(LOG_LEVEL_CONNECT, "SOCKS4 negotiation write failed...");
close_socket(sfd);
{
log_error(LOG_LEVEL_CONNECT, "SOCKS4 negotiation write failed...");
close_socket(sfd);
- return(
-1
);
+ return(
JB_INVALID_SOCKET
);
}
}
- if (
(n = read_socket(sfd, sbuf, sizeof(sbuf)
)) != sizeof(*s))
+ if (
read_socket(sfd, sbuf, sizeof(sbuf
)) != sizeof(*s))
{
log_error(LOG_LEVEL_CONNECT, "SOCKS4 negotiation read failed...");
close_socket(sfd);
{
log_error(LOG_LEVEL_CONNECT, "SOCKS4 negotiation read failed...");
close_socket(sfd);
- return(
-1
);
+ return(
JB_INVALID_SOCKET
);
}
switch (s->cd)
}
switch (s->cd)
@@
-343,7
+350,7
@@
static int socks4_connect(const struct forward_spec * fwd,
log_error(LOG_LEVEL_CONNECT, "socks4_connect: %s ...", errstr);
close_socket(sfd);
log_error(LOG_LEVEL_CONNECT, "socks4_connect: %s ...", errstr);
close_socket(sfd);
- return(
-1
);
+ return(
JB_INVALID_SOCKET
);
}
}