projects
/
privoxy.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- Introduced pcrs_strerror()
[privoxy.git]
/
jbsockets.c
diff --git
a/jbsockets.c
b/jbsockets.c
index
3f54271
..
7284820
100644
(file)
--- a/
jbsockets.c
+++ b/
jbsockets.c
@@
-1,4
+1,4
@@
-const char jbsockets_rcs[] = "$Id: jbsockets.c,v 1.1
3 2001/07/15 13:56:57
jongfoster Exp $";
+const char jbsockets_rcs[] = "$Id: jbsockets.c,v 1.1
5 2001/07/29 17:40:43
jongfoster Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/jbsockets.c,v $
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/jbsockets.c,v $
@@
-35,6
+35,12
@@
const char jbsockets_rcs[] = "$Id: jbsockets.c,v 1.13 2001/07/15 13:56:57 jongfo
*
* Revisions :
* $Log: jbsockets.c,v $
*
* Revisions :
* $Log: jbsockets.c,v $
+ * Revision 1.15 2001/07/29 17:40:43 jongfoster
+ * Fixed compiler warning by adding a cast
+ *
+ * Revision 1.14 2001/07/18 13:47:59 oes
+ * Eliminated dirty hack for getsockbyname()
+ *
* Revision 1.13 2001/07/15 13:56:57 jongfoster
* Removing unused local variable.
*
* Revision 1.13 2001/07/15 13:56:57 jongfoster
* Removing unused local variable.
*
@@
-149,9
+155,9
@@
int connect_to(const char *host, int portnum, struct client_state *csp)
int flags;
#endif /* !defined(_WIN32) && !defined(__BEOS__) && !defined(AMIGA) */
int flags;
#endif /* !defined(_WIN32) && !defined(__BEOS__) && !defined(AMIGA) */
-#ifdef
ACL_FILES
+#ifdef
FEATURE_ACL
struct access_control_addr dst[1];
struct access_control_addr dst[1];
-#endif /* def
ACL_FILES
*/
+#endif /* def
FEATURE_ACL
*/
memset((char *)&inaddr, 0, sizeof inaddr);
memset((char *)&inaddr, 0, sizeof inaddr);
@@
-161,7
+167,7
@@
int connect_to(const char *host, int portnum, struct client_state *csp)
return(-1);
}
return(-1);
}
-#ifdef
ACL_FILES
+#ifdef
FEATURE_ACL
dst->addr = ntohl(addr);
dst->port = portnum;
dst->addr = ntohl(addr);
dst->port = portnum;
@@
-170,7
+176,7
@@
int connect_to(const char *host, int portnum, struct client_state *csp)
errno = EPERM;
return(-1);
}
errno = EPERM;
return(-1);
}
-#endif /* def
ACL_FILES
*/
+#endif /* def
FEATURE_ACL
*/
inaddr.sin_addr.s_addr = addr;
inaddr.sin_family = AF_INET;
inaddr.sin_addr.s_addr = addr;
inaddr.sin_family = AF_INET;
@@
-471,7
+477,8
@@
int accept_connection(struct client_state * csp, int fd)
{
csp->my_ip_addr_str = strdup(inet_ntoa(server.sin_addr));
{
csp->my_ip_addr_str = strdup(inet_ntoa(server.sin_addr));
- host = gethostbyaddr(&server.sin_addr, sizeof(server.sin_addr), AF_INET);
+ host = gethostbyaddr((const char *)&server.sin_addr,
+ sizeof(server.sin_addr), AF_INET);
if (host == NULL)
{
log_error(LOG_LEVEL_ERROR, "Unable to get my own hostname: %E\n");
if (host == NULL)
{
log_error(LOG_LEVEL_ERROR, "Unable to get my own hostname: %E\n");