projects
/
privoxy.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- Block .googleadservices.com/~.
[privoxy.git]
/
jbsockets.c
diff --git
a/jbsockets.c
b/jbsockets.c
index
d601fb2
..
0693fe4
100644
(file)
--- a/
jbsockets.c
+++ b/
jbsockets.c
@@
-1,4
+1,4
@@
-const char jbsockets_rcs[] = "$Id: jbsockets.c,v 1.4
7 2008/03/26 18:07:07
fabiankeil Exp $";
+const char jbsockets_rcs[] = "$Id: jbsockets.c,v 1.4
8 2008/09/04 08:13:58
fabiankeil Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/jbsockets.c,v $
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/jbsockets.c,v $
@@
-35,6
+35,10
@@
const char jbsockets_rcs[] = "$Id: jbsockets.c,v 1.47 2008/03/26 18:07:07 fabian
*
* Revisions :
* $Log: jbsockets.c,v $
*
* Revisions :
* $Log: jbsockets.c,v $
+ * Revision 1.48 2008/09/04 08:13:58 fabiankeil
+ * Prepare for critical sections on Windows by adding a
+ * layer of indirection before the pthread mutex functions.
+ *
* Revision 1.47 2008/03/26 18:07:07 fabiankeil
* Add hostname directive. Closes PR#1918189.
*
* Revision 1.47 2008/03/26 18:07:07 fabiankeil
* Add hostname directive. Closes PR#1918189.
*
@@
-335,7
+339,7
@@
const char jbsockets_h_rcs[] = JBSOCKETS_H_VERSION;
*
* Parameters :
* 1 : host = hostname to connect to
*
* Parameters :
* 1 : host = hostname to connect to
- * 2 : portnum = port to connent on
+ * 2 : portnum = port to connent on
(XXX: should be unsigned)
* 3 : csp = Current client state (buffers, headers, etc...)
* Not modified, only used for source IP and ACL.
*
* 3 : csp = Current client state (buffers, headers, etc...)
* Not modified, only used for source IP and ACL.
*
@@
-347,7
+351,7
@@
jb_socket connect_to(const char *host, int portnum, struct client_state *csp)
{
struct sockaddr_in inaddr;
jb_socket fd;
{
struct sockaddr_in inaddr;
jb_socket fd;
- int addr;
+
unsigned
int addr;
fd_set wfds;
struct timeval tv[1];
#if !defined(_WIN32) && !defined(__BEOS__) && !defined(AMIGA)
fd_set wfds;
struct timeval tv[1];
#if !defined(_WIN32) && !defined(__BEOS__) && !defined(AMIGA)
@@
-367,7
+371,7
@@
jb_socket connect_to(const char *host, int portnum, struct client_state *csp)
}
#ifdef FEATURE_ACL
}
#ifdef FEATURE_ACL
- dst->addr = ntohl(
(unsigned long)
addr);
+ dst->addr = ntohl(addr);
dst->port = portnum;
if (block_acl(dst, csp))
dst->port = portnum;
if (block_acl(dst, csp))