projects
/
privoxy.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
block another omniture tracking domain
[privoxy.git]
/
jbsockets.c
diff --git
a/jbsockets.c
b/jbsockets.c
index
b234b20
..
ef5e067
100644
(file)
--- a/
jbsockets.c
+++ b/
jbsockets.c
@@
-1,4
+1,4
@@
-const char jbsockets_rcs[] = "$Id: jbsockets.c,v 1.7
2 2010/02/15 15:14:10
fabiankeil Exp $";
+const char jbsockets_rcs[] = "$Id: jbsockets.c,v 1.7
5 2010/06/13 12:29:05
fabiankeil Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/jbsockets.c,v $
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/jbsockets.c,v $
@@
-146,9
+146,9
@@
jb_socket connect_to(const char *host, int portnum, struct client_state *csp)
jb_socket fd;
fd_set wfds;
struct timeval tv[1];
jb_socket fd;
fd_set wfds;
struct timeval tv[1];
-#if !defined(_WIN32) && !defined(__BEOS__) && !defined(AMIGA)
+#if !defined(_WIN32) && !defined(__BEOS__) && !defined(AMIGA)
&& !defined(__OS2__)
int flags;
int flags;
-#endif
/* !defined(_WIN32) && !defined(__BEOS__) && !defined(AMIGA) */
+#endif
int connect_failed;
#ifdef FEATURE_ACL
int connect_failed;
#ifdef FEATURE_ACL
@@
-344,9
+344,9
@@
jb_socket connect_to(const char *host, int portnum, struct client_state *csp)
unsigned int addr;
fd_set wfds;
struct timeval tv[1];
unsigned int addr;
fd_set wfds;
struct timeval tv[1];
-#if !defined(_WIN32) && !defined(__BEOS__) && !defined(AMIGA)
+#if !defined(_WIN32) && !defined(__BEOS__) && !defined(AMIGA)
&& !defined(__OS2__)
int flags;
int flags;
-#endif
/* !defined(_WIN32) && !defined(__BEOS__) && !defined(AMIGA) */
+#endif
#ifdef FEATURE_ACL
struct access_control_addr dst[1];
#ifdef FEATURE_ACL
struct access_control_addr dst[1];
@@
-511,7
+511,7
@@
int write_socket(jb_socket fd, const char *buf, size_t len)
*/
#define SOCKET_SEND_MAX 65000
{
*/
#define SOCKET_SEND_MAX 65000
{
- int
write_len = 0,
send_len, send_rc = 0, i = 0;
+ int send_len, send_rc = 0, i = 0;
while ((i < len) && (send_rc != -1))
{
if ((i + SOCKET_SEND_MAX) > len)
while ((i < len) && (send_rc != -1))
{
if ((i + SOCKET_SEND_MAX) > len)
@@
-1103,7
+1103,6
@@
unsigned long resolve_hostname_to_ip(const char *host)
{
struct sockaddr_in inaddr;
struct hostent *hostp;
{
struct sockaddr_in inaddr;
struct hostent *hostp;
- unsigned int dns_retries = 0;
#if defined(HAVE_GETHOSTBYNAME_R_6_ARGS) || defined(HAVE_GETHOSTBYNAME_R_5_ARGS) || defined(HAVE_GETHOSTBYNAME_R_3_ARGS)
struct hostent result;
#if defined(HAVE_GETHOSTBYNAME_R_6_ARGS) || defined(HAVE_GETHOSTBYNAME_R_5_ARGS)
#if defined(HAVE_GETHOSTBYNAME_R_6_ARGS) || defined(HAVE_GETHOSTBYNAME_R_5_ARGS) || defined(HAVE_GETHOSTBYNAME_R_3_ARGS)
struct hostent result;
#if defined(HAVE_GETHOSTBYNAME_R_6_ARGS) || defined(HAVE_GETHOSTBYNAME_R_5_ARGS)
@@
-1123,6
+1122,7
@@
unsigned long resolve_hostname_to_ip(const char *host)
if ((inaddr.sin_addr.s_addr = inet_addr(host)) == -1)
{
if ((inaddr.sin_addr.s_addr = inet_addr(host)) == -1)
{
+ unsigned int dns_retries = 0;
#if defined(HAVE_GETHOSTBYNAME_R_6_ARGS)
while (gethostbyname_r(host, &result, hbuf,
HOSTENT_BUFFER_SIZE, &hostp, &thd_err)
#if defined(HAVE_GETHOSTBYNAME_R_6_ARGS)
while (gethostbyname_r(host, &result, hbuf,
HOSTENT_BUFFER_SIZE, &hostp, &thd_err)