-const char jbsockets_rcs[] = "$Id: jbsockets.c,v 1.3 2001/05/25 21:57:54 jongfoster Exp $";
+const char jbsockets_rcs[] = "$Id: jbsockets.c,v 1.8 2001/06/03 19:12:07 oes Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/jbsockets.c,v $
*
* Revisions :
* $Log: jbsockets.c,v $
+ * Revision 1.8 2001/06/03 19:12:07 oes
+ * filled comment
+ *
+ * Revision 1.8 2001/06/03 11:03:48 oes
+ * Makefile/in
+ *
+ * introduced cgi.c
+ *
+ * actions.c:
+ *
+ * adapted to new enlist_unique arg format
+ *
+ * conf loadcfg.c
+ *
+ * introduced confdir option
+ *
+ * filters.c filtrers.h
+ *
+ * extracted-CGI relevant stuff
+ *
+ * jbsockets.c
+ *
+ * filled comment
+ *
+ * jcc.c
+ *
+ * support for new cgi mechansim
+ *
+ * list.c list.h
+ *
+ * functions for new list type: "map"
+ * extended enlist_unique
+ *
+ * miscutil.c .h
+ * introduced bindup()
+ *
+ * parsers.c parsers.h
+ *
+ * deleted const struct interceptors
+ *
+ * pcrs.c
+ * added FIXME
+ *
+ * project.h
+ *
+ * added struct map
+ * added struct http_response
+ * changes struct interceptors to struct cgi_dispatcher
+ * moved HTML stuff to cgi.h
+ *
+ * re_filterfile:
+ *
+ * changed
+ *
+ * showargs.c
+ * NO TIME LEFT
+ *
+ * Revision 1.7 2001/05/28 16:14:00 jongfoster
+ * Fixing bug in LOG_LEVEL_LOG
+ *
+ * Revision 1.6 2001/05/26 17:28:32 jongfoster
+ * Fixed LOG_LEVEL_LOG
+ *
+ * Revision 1.5 2001/05/26 15:26:15 jongfoster
+ * ACL feature now provides more security by immediately dropping
+ * connections from untrusted hosts.
+ *
+ * Revision 1.4 2001/05/26 00:37:42 jongfoster
+ * Cosmetic indentation correction.
+ *
* Revision 1.3 2001/05/25 21:57:54 jongfoster
* Now gives a warning under Windows if you try to bind
* it to a port that's already in use.
#include "project.h"
#include "jbsockets.h"
#include "filters.h"
+#include "errlog.h"
const char jbsockets_h_rcs[] = JBSOCKETS_H_VERSION;
* Returns : -1 => failure, else it is the socket file descriptor.
*
*********************************************************************/
-int connect_to(char *host, int portnum, struct client_state *csp)
+int connect_to(const char *host, int portnum, struct client_state *csp)
{
struct sockaddr_in inaddr;
int fd, addr;
#endif /* !defined(_WIN32) && !defined(__BEOS__) && !defined(AMIGA) */
#ifdef ACL_FILES
- struct access_control_addr src[1], dst[1];
+ struct access_control_addr dst[1];
#endif /* def ACL_FILES */
memset((char *)&inaddr, 0, sizeof inaddr);
}
#ifdef ACL_FILES
- src->addr = csp->ip_addr_long;
- src->port = 0;
-
dst->addr = ntohl(addr);
dst->port = portnum;
- if (block_acl(src, dst, csp))
+ if (block_acl(dst, csp))
{
errno = EPERM;
return(-1);
* 2 : buf = pointer to data to be written.
* 3 : len = length of data to be written to the socket "fd".
*
- * Returns : Win32: If no error occurs, returns the total number of
+ * Returns : Win32 & Unix: If no error occurs, returns the total number of
* bytes sent, which can be less than the number
* indicated by len. Otherwise, returns (-1).
- * Unix: ??? (Please fill me in!)
*
*********************************************************************/
int write_socket(int fd, const char *buf, int len)
return(0);
}
- /* if (DEBUG(LOG)) fwrite(buf, n, 1, logfp); */
+ log_error(LOG_LEVEL_LOG, "%N", len, buf);
#if defined(_WIN32) || defined(__BEOS__) || defined(AMIGA)
return( send(fd, buf, len, 0));