projects
/
privoxy.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bump generated Firefox version to 3.6.15.
[privoxy.git]
/
jbsockets.c
diff --git
a/jbsockets.c
b/jbsockets.c
index
7144028
..
02e5c75
100644
(file)
--- a/
jbsockets.c
+++ b/
jbsockets.c
@@
-1,4
+1,4
@@
-const char jbsockets_rcs[] = "$Id: jbsockets.c,v 1.7
3 2010/04/23 11:53:48
fabiankeil Exp $";
+const char jbsockets_rcs[] = "$Id: jbsockets.c,v 1.7
8 2010/07/26 11:28:11
fabiankeil Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/jbsockets.c,v $
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/jbsockets.c,v $
@@
-8,7
+8,7
@@
const char jbsockets_rcs[] = "$Id: jbsockets.c,v 1.73 2010/04/23 11:53:48 fabian
* OS-independent. Contains #ifdefs to make this work
* on many platforms.
*
* OS-independent. Contains #ifdefs to make this work
* on many platforms.
*
- * Copyright : Written by and Copyright (C) 2001-20
09
the
+ * Copyright : Written by and Copyright (C) 2001-20
10
the
* Privoxy team. http://www.privoxy.org/
*
* Based on the Internet Junkbuster originally written
* Privoxy team. http://www.privoxy.org/
*
* Based on the Internet Junkbuster originally written
@@
-498,7
+498,7
@@
int write_socket(jb_socket fd, const char *buf, size_t len)
return 1;
}
return 1;
}
- log_error(LOG_LEVEL_
LOG, "%N"
, len, buf);
+ log_error(LOG_LEVEL_
WRITING, "to socket %d: %N", fd
, len, buf);
#if defined(_WIN32)
return (send(fd, buf, (int)len, 0) != (int)len);
#if defined(_WIN32)
return (send(fd, buf, (int)len, 0) != (int)len);
@@
-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)
@@
-559,18
+559,27
@@
int write_socket(jb_socket fd, const char *buf, size_t len)
*********************************************************************/
int read_socket(jb_socket fd, char *buf, int len)
{
*********************************************************************/
int read_socket(jb_socket fd, char *buf, int len)
{
+ int ret;
+
if (len <= 0)
{
return(0);
}
#if defined(_WIN32)
if (len <= 0)
{
return(0);
}
#if defined(_WIN32)
- ret
urn(recv(fd, buf, len, 0)
);
+ ret
= recv(fd, buf, len, 0
);
#elif defined(__BEOS__) || defined(AMIGA) || defined(__OS2__)
#elif defined(__BEOS__) || defined(AMIGA) || defined(__OS2__)
- ret
urn(recv(fd, buf, (size_t)len, 0)
);
+ ret
= recv(fd, buf, (size_t)len, 0
);
#else
#else
- ret
urn((int)read(fd, buf, (size_t)len)
);
+ ret
= (int)read(fd, buf, (size_t)len
);
#endif
#endif
+
+ if (ret > 0)
+ {
+ log_error(LOG_LEVEL_RECEIVED, "from socket %d: %N", fd, ret, buf);
+ }
+
+ return ret;
}
}
@@
-1103,7
+1112,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
+1131,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)