#ifndef PROJECT_H_INCLUDED
#define PROJECT_H_INCLUDED
-#define PROJECT_H_VERSION "$Id: project.h,v 1.45 2002/01/09 14:33:27 oes Exp $"
+#define PROJECT_H_VERSION "$Id: project.h,v 1.50 2002/03/04 19:32:07 oes Exp $"
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/project.h,v $
*
* Revisions :
* $Log: project.h,v $
+ * Revision 1.50 2002/03/04 19:32:07 oes
+ * Changed default port to 8118
+ *
+ * Revision 1.49 2002/03/04 18:28:55 oes
+ * Deleted PID_FILE_NAME
+ *
+ * Revision 1.48 2002/03/03 14:50:40 oes
+ * Fixed CLF logging: Added ocmd member for client's request to struct http_request
+ *
+ * Revision 1.47 2002/02/20 23:15:13 jongfoster
+ * Parsing functions now handle out-of-memory gracefully by returning
+ * an error code.
+ *
+ * Revision 1.46 2002/01/17 21:06:09 jongfoster
+ * Now #defining the URLs of the config interface
+ *
+ * Minor changes to struct http_request and struct url_spec due to
+ * standardizing that struct http_request is used to represent a URL, and
+ * struct url_spec is used to represent a URL pattern. (Before, URLs were
+ * represented as seperate variables and a partially-filled-in url_spec).
+ *
* Revision 1.45 2002/01/09 14:33:27 oes
* Added HOSTENT_BUFFER_SIZE
*
extern "C" {
#endif
-#ifdef _DEBUG
-extern int ldebug;
-#define DBG(a,b) { if ( ldebug >= a ) { printf b ; }}
-#else
-#define DBG(a,b)
-#endif /* _DEBUG */
-
-
/*
* Error codes. Functions returning these should return a jb_err
/* Default IP and port to listen on */
#define HADDR_DEFAULT "127.0.0.1"
-#define HADDR_PORT 8000
-
-/*
- * pid file name
- */
-#define PID_FILE_NAME "junkbuster.pid"
+#define HADDR_PORT 8118
/* Forward defs for various structures */
struct http_request
{
char *cmd; /* Whole command line: method, URL, Version */
+ char *ocmd; /* Backup of original cmd for CLF logging */
char *gpc; /* HTTP method: GET, POST, .. */
char *url; /* The URL */
char *ver; /* Protocol version */
};
+/*
+ * A function to add a header
+ */
+typedef jb_err (*add_header_func_ptr)(struct client_state *);
+
+/*
+ * A function to process a header
+ */
+typedef jb_err (*parser_func_ptr )(struct client_state *, char **);
+
/*
* List of functions to run on a list of headers
*/
{
char *str;
char len;
- char *(*parser)(const struct parsers *, const char *, struct client_state *);
+ parser_func_ptr parser;
};
/*
* Port and IP to bind to.
- * Defaults to HADDR_DEFAULT:HADDR_PORT == 127.0.0.1:8000
+ * Defaults to HADDR_DEFAULT:HADDR_PORT == 127.0.0.1:8118
*/
const char *haddr;
int hport;