/*
* $Id$
- */
-/**
- * \defgroup WebServerII some of the webserver stuff.
+ *
* This is the other half of the webserver. It handles the task of hooking
* up HTTP requests with the sessions they belong to, using HTTP cookies to
* keep track of things. If the HTTP request doesn't belong to any currently
* active session, a new session is started.
- * \ingroup WebcitHttpServer
*
*/
-/*@{*/
+
#include "webcit.h"
#include "webserver.h"
-/** Only one thread may manipulate SessionList at a time... */
+/* Only one thread may manipulate SessionList at a time... */
pthread_mutex_t SessionListMutex;
struct wcsession *SessionList = NULL; /**< our sessions ????*/
pthread_key_t MyConKey; /**< TSD key for MySession() */
-/**
- * \brief free the memory used for viewing atachments
- * \param sess the session object to destroy
+/*
+ * free the memory used for viewing atachments
*/
void free_attachments(struct wcsession *sess) {
struct wc_attachment *att;
}
}
-/**
- * \brief what??????
- */
+
+void shutdown_sessions(void)
+{
+ struct wcsession *sptr;
+
+ for (sptr = SessionList; sptr != NULL; sptr = sptr->next) {
+ sptr->killthis = 1;
+ }
+}
+
void do_housekeeping(void)
{
struct wcsession *sptr, *ss;
pthread_mutex_lock(&sessions_to_kill->SessionMutex);
close(sessions_to_kill->serv_sock);
close(sessions_to_kill->chat_sock);
- if (sessions_to_kill->preferences != NULL) {
- free(sessions_to_kill->preferences);
- }
+// if (sessions_to_kill->preferences != NULL) {
+// free(sessions_to_kill->preferences);
+// }
if (sessions_to_kill->cache_fold != NULL) {
free(sessions_to_kill->cache_fold);
}
free_attachments(sessions_to_kill);
free_march_list(sessions_to_kill);
+ DeleteHash(&(sessions_to_kill->hash_prefs));
+ DeleteHash(&(sessions_to_kill->IconBarSetttings));
+
pthread_mutex_unlock(&sessions_to_kill->SessionMutex);
sptr = sessions_to_kill->next;
free(sessions_to_kill);
}
-/**
- * \brief Collapse multiple cookies on one line
- * \param sock a socket?
- * \param buf some bunch of chars?
- * \param hold hold what?
+/*
+ * Collapse multiple cookies on one line
*/
-int req_gets(int sock, char *buf, char *hold)
+int req_gets(int sock, char *buf, char *hold, size_t hlen)
{
- int a;
+ int a, b;
- if (strlen(hold) == 0) {
+ if (IsEmptyStr(hold)) {
strcpy(buf, "");
a = client_getln(sock, buf, SIZ);
if (a<1) return(-1);
strcpy(hold, "");
if (!strncasecmp(buf, "Cookie: ", 8)) {
- for (a = 0; a < strlen(buf); ++a)
+ int len;
+ len = strlen(buf);
+ for (a = 0; a < len; ++a)
if (buf[a] == ';') {
- sprintf(hold, "Cookie: %s", &buf[a + 1]);
+ // we don't refresh len, because of we
+ // only exit from here.
+ snprintf(hold, hlen, "Cookie: %s", &buf[a + 1]);
buf[a] = 0;
- while (isspace(hold[8]))
- strcpy(&hold[8], &hold[9]);
+ b = 8;
+ while (isspace(hold[b]))
+ b++;
+
+ memmove(&hold[8], &hold[b], len - b + 1);
return(0);
}
}
return(0);
}
-/**
- * \brief close some fd for some reason???
- * \param fd the fd to close??????
+/*
* lingering_close() a`la Apache. see
* http://www.apache.org/docs/misc/fin_wait_2.html for rationale
*/
-
int lingering_close(int fd)
{
char buf[SIZ];
*/
memset(hold, 0, sizeof(hold));
do {
- if (req_gets(sock, buf, hold) < 0) return;
+ if (req_gets(sock, buf, hold, SIZ) < 0) return;
/**
* Can we compress?
safestrncpy(hptr->line, buf, sizeof hptr->line);
- } while (strlen(buf) > 0);
+ } while (!IsEmptyStr(buf));
/**
* If the request is prefixed by "/webcit" then chop that off. This
for (sptr = SessionList; sptr != NULL; sptr = sptr->next) {
/** If HTTP-AUTH, look for a session with matching credentials */
- if ( (strlen(httpauth_user) > 0)
+ if ( (!IsEmptyStr(httpauth_user))
&&(!strcasecmp(sptr->httpauth_user, httpauth_user))
&&(!strcasecmp(sptr->httpauth_pass, httpauth_pass)) ) {
TheSession = sptr;
strcpy(TheSession->httpauth_user, httpauth_user);
strcpy(TheSession->httpauth_pass, httpauth_pass);
+ TheSession->hash_prefs = NewHash(1,NULL); /* Get a hash table for the user preferences */
pthread_mutex_init(&TheSession->SessionMutex, NULL);
pthread_mutex_lock(&SessionListMutex);
+ TheSession->urlstrings = NULL;
+ TheSession->vars = NULL;
TheSession->nonce = rand();
TheSession->next = SessionList;
SessionList = TheSession;
session_is_new = 1;
}
- /**
+ /*
* A future improvement might be to check the session integrity
* at this point before continuing.
*/
- /**
+ /*
* Bind to the session and perform the transaction
*/
- pthread_mutex_lock(&TheSession->SessionMutex); /*< bind */
+ pthread_mutex_lock(&TheSession->SessionMutex); /* bind */
pthread_setspecific(MyConKey, (void *)TheSession);
+
+ TheSession->urlstrings = NewHash(1,NULL);
+ TheSession->vars = NewHash(1,NULL);
TheSession->http_sock = sock;
- TheSession->lastreq = time(NULL); /*< log */
+ TheSession->lastreq = time(NULL); /* log */
TheSession->gzip_ok = gzip_ok;
#ifdef ENABLE_NLS
if (session_is_new) {
httplang_to_locale(accept_language);
}
- go_selected_language(); /*< set locale */
+ go_selected_language(); /* set locale */
#endif
- session_loop(req); /*< do transaction */
+ session_loop(req); /* do transaction */
#ifdef ENABLE_NLS
- stop_selected_language(); /*< unset locale */
+ stop_selected_language(); /* unset locale */
#endif
- pthread_mutex_unlock(&TheSession->SessionMutex); /*< unbind */
+ DeleteHash(&TheSession->urlstrings);
+ DeleteHash(&TheSession->vars);
+
+ pthread_mutex_unlock(&TheSession->SessionMutex); /* unbind */
- /** Free the request buffer */
+ /* Free the request buffer */
while (req != NULL) {
hptr = req->next;
free(req);
req = hptr;
}
- /**
+ /*
* Free up any session-local substitution variables which
* were set during this transaction
*/
- clear_local_substs();
+
+
}
-/*@}*/
projects / citadel.git / blobdiff