X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fwebserver.c;h=ef1c5eb8e66cd4ef1b19eccaff7f80c76b59397a;hb=d04995c5146e2987bea4875e88c5e6da04ecc048;hp=73f956c31af193871dbc825111b76bd0981a4d9d;hpb=3922a5371c59a2fc0cc7c0f1e84c32f9dfc46ae8;p=citadel.git
diff --git a/webcit/webserver.c b/webcit/webserver.c
index 73f956c31..ef1c5eb8e 100644
--- a/webcit/webserver.c
+++ b/webcit/webserver.c
@@ -17,13 +17,13 @@ int vsnprintf(char *buf, size_t max, const char *fmt, va_list argp);
#endif
-extern int msock; /* master listening socket */
-extern int verbosity; /* Logging level */
+extern int msock; /* master listening socket */
+extern int verbosity; /* Logging level */
extern char static_icon_dir[PATH_MAX]; /* where should we find our mime icons */
-int is_https = 0; /* Nonzero if I am an HTTPS service */
-int follow_xff = 0; /* Follow X-Forwarded-For: header */
-int home_specified = 0; /* did the user specify a homedir? */
+int is_https = 0; /* Nonzero if I am an HTTPS service */
+int follow_xff = 0; /* Follow X-Forwarded-For: header? */
int DisableGzip = 0;
+char *default_landing_page = NULL; /* FIXME we need to populate this somehow */
extern pthread_mutex_t SessionListMutex;
extern pthread_key_t MyConKey;
@@ -34,21 +34,19 @@ extern void graceful_shutdown_watcher(int signum);
extern void graceful_shutdown(int signum);
extern void start_daemon(char *pid_file);
extern void webcit_calc_dirs_n_files(int relh, const char *basedir, int home, char *webcitdir, char *relhome);
-
+extern void worker_entry(void);
extern void drop_root(uid_t UID);
-char socket_dir[PATH_MAX]; /* where to talk to our citadel server */
-
+char socket_dir[PATH_MAX]; /* where to talk to our citadel server */
char *server_cookie = NULL; /* our Cookie connection to the client */
int http_port = PORT_NUM; /* Port to listen on */
-char *ctdlhost = DEFAULT_HOST; /* our name */
-char *ctdlport = DEFAULT_PORT; /* our Port */
-int setup_wizard = 0; /* should we run the setup wizard? \todo */
-char wizard_filename[PATH_MAX]; /* where's the setup wizard? */
+char *ctdlhost = DEFAULT_HOST; /* Host name or IP address of Citadel server */
+char *ctdlport = DEFAULT_PORT; /* Port number of Citadel server */
+int setup_wizard = 0; /* should we run the setup wizard? */
+char wizard_filename[PATH_MAX]; /* location of file containing the last webcit version against which we ran setup wizard */
int running_as_daemon = 0; /* should we deamonize on startup? */
-
/* #define DBG_PRINNT_HOOKS_AT_START */
#ifdef DBG_PRINNT_HOOKS_AT_START
extern HashList *HandlerHash;
@@ -65,6 +63,7 @@ extern int LoadTemplates;
+
/*
* Here's where it all begins.
*/
@@ -79,7 +78,6 @@ int main(int argc, char **argv)
char ip_addr[256]="*";
int relh=0;
int home=0;
- int home_specified=0;
char relhome[PATH_MAX]="";
char webcitdir[PATH_MAX] = DATADIR;
char *pidfile = NULL;
@@ -111,9 +109,9 @@ int main(int argc, char **argv)
/* Parse command line */
#ifdef HAVE_OPENSSL
- while ((a = getopt(argc, argv, "u:h:i:p:t:T:B:x:dD:G:cfsS:Z")) != EOF)
+ while ((a = getopt(argc, argv, "u:h:i:p:t:T:B:x:g:dD:G:cfsS:Z")) != EOF)
#else
- while ((a = getopt(argc, argv, "u:h:i:p:t:T:B:x:dD:G:cfZ")) != EOF)
+ while ((a = getopt(argc, argv, "u:h:i:p:t:T:B:x:g:dD:G:cfZ")) != EOF)
#endif
switch (a) {
case 'u':
@@ -129,7 +127,6 @@ int main(int argc, char **argv)
safestrncpy(relhome, relhome, sizeof relhome);
}
/* free(hdir); TODO: SHOULD WE DO THIS? */
- home_specified = 1;
home=1;
break;
case 'd':
@@ -139,6 +136,9 @@ int main(int argc, char **argv)
pidfile = strdup(optarg);
running_as_daemon = 1;
break;
+ case 'g':
+ default_landing_page = strdup(optarg);
+ break;
case 'B': /* Basesize */
basesize = atoi(optarg);
if (basesize > 2)
@@ -182,8 +182,7 @@ int main(int argc, char **argv)
if (gethostname
(&server_cookie[strlen(server_cookie)],
200) != 0) {
- lprintf(2, "gethostname: %s\n",
- strerror(errno));
+ syslog(2, "gethostname: %s", strerror(errno));
free(server_cookie);
}
}
@@ -240,22 +239,22 @@ int main(int argc, char **argv)
LoadIconDir(static_icon_dir);
/* Tell 'em who's in da house */
- lprintf(1, PACKAGE_STRING "\n");
- lprintf(1, "Copyright (C) 1996-2011 by the citadel.org team\n");
- lprintf(1, "\n");
- lprintf(1, "This program is open source software: you can redistribute it and/or\n");
- lprintf(1, "modify it under the terms of the GNU General Public License as published\n");
- lprintf(1, "by the Free Software Foundation, either version 3 of the License, or\n");
- lprintf(1, "(at your option) any later version.\n");
- lprintf(1, "\n");
- lprintf(1, "This program is distributed in the hope that it will be useful,\n");
- lprintf(1, "but WITHOUT ANY WARRANTY; without even the implied warranty of\n");
- lprintf(1, "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n");
- lprintf(1, "GNU General Public License for more details.\n");
- lprintf(1, "\n");
- lprintf(1, "You should have received a copy of the GNU General Public License\n");
- lprintf(1, "along with this program. If not, see .\n");
- lprintf(1, "\n");
+ syslog(1, "%s", PACKAGE_STRING);
+ syslog(1, "Copyright (C) 1996-2011 by the citadel.org team");
+ syslog(1, " ");
+ syslog(1, "This program is open source software: you can redistribute it and/or");
+ syslog(1, "modify it under the terms of the GNU General Public License as published");
+ syslog(1, "by the Free Software Foundation, either version 3 of the License, or");
+ syslog(1, "(at your option) any later version.");
+ syslog(1, " ");
+ syslog(1, "This program is distributed in the hope that it will be useful,");
+ syslog(1, "but WITHOUT ANY WARRANTY; without even the implied warranty of");
+ syslog(1, "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the");
+ syslog(1, "GNU General Public License for more details.");
+ syslog(1, " ");
+ syslog(1, "You should have received a copy of the GNU General Public License");
+ syslog(1, "along with this program. If not, see .");
+ syslog(1, " ");
/* initialize various subsystems */
@@ -266,16 +265,16 @@ int main(int argc, char **argv)
FILE *fd;
StrBufAppendBufPlain(I18nDump, HKEY("}\n"), 0);
if (StrLength(I18nDump) < 50) {
- lprintf(1, "********************************************************************************\n");
- lprintf(1, "* No strings found in templates! Are you sure they're there? *\n");
- lprintf(1, "********************************************************************************\n");
+ syslog(1, "********************************************************************************\n");
+ syslog(1, "* No strings found in templates! Are you sure they're there? *\n");
+ syslog(1, "********************************************************************************\n");
return -1;
}
fd = fopen(I18nDumpFile, "w");
if (fd == NULL) {
- lprintf(1, "********************************************************************************\n");
- lprintf(1, "* unable to open I18N dumpfile [%s] *\n", I18nDumpFile);
- lprintf(1, "********************************************************************************\n");
+ syslog(1, "********************************************************************************\n");
+ syslog(1, "* unable to open I18N dumpfile [%s] *\n", I18nDumpFile);
+ syslog(1, "********************************************************************************\n");
return -1;
}
rv = fwrite(ChrPtr(I18nDump), 1, StrLength(I18nDump), fd);
@@ -296,7 +295,7 @@ int main(int argc, char **argv)
* wcsession struct to which the thread is currently bound.
*/
if (pthread_key_create(&MyConKey, NULL) != 0) {
- lprintf(1, "Can't create TSD key: %s\n", strerror(errno));
+ syslog(1, "Can't create TSD key: %s\n", strerror(errno));
}
InitialiseSemaphores ();
@@ -308,7 +307,7 @@ int main(int argc, char **argv)
*/
#ifdef HAVE_OPENSSL
if (pthread_key_create(&ThreadSSL, NULL) != 0) {
- lprintf(1, "Can't create TSD key: %s\n", strerror(errno));
+ syslog(1, "Can't create TSD key: %s\n", strerror(errno));
}
#endif
@@ -319,11 +318,11 @@ int main(int argc, char **argv)
*/
if (!IsEmptyStr(uds_listen_path)) {
- lprintf(2, "Attempting to create listener socket at %s...\n", uds_listen_path);
+ syslog(2, "Attempting to create listener socket at %s...\n", uds_listen_path);
msock = webcit_uds_server(uds_listen_path, LISTEN_QUEUE_LENGTH);
}
else {
- lprintf(2, "Attempting to bind to port %d...\n", http_port);
+ syslog(2, "Attempting to bind to port %d...\n", http_port);
msock = webcit_tcp_server(ip_addr, http_port, LISTEN_QUEUE_LENGTH);
}
if (msock < 0)
@@ -332,7 +331,7 @@ int main(int argc, char **argv)
return -msock;
}
- lprintf(2, "Listening on socket %d\n", msock);
+ syslog(2, "Listening on socket %d\n", msock);
signal(SIGPIPE, SIG_IGN);
pthread_mutex_init(&SessionListMutex, NULL);
@@ -358,7 +357,7 @@ int main(int argc, char **argv)
/* Become a worker thread. More worker threads will be spawned as they are needed. */
worker_entry();
- ShutDownLibCitadel ();
+ ShutDownLibCitadel();
return 0;
}