#include <syslog.h>
#include <dlfcn.h>
#include <netdb.h>
+#include <sys/types.h>
#include <sys/socket.h>
#include <netinet/in.h>
#include <arpa/inet.h>
}
/* Remove the context from the global context list. This needs
- * to get done FIRST to avoid concurrency problems.
+ * to get done FIRST to avoid concurrency problems. It is *vitally*
+ * important to keep num_sessions accurate!!
*/
lprintf(7, "Removing context for session %d\n", con->cs_pid);
begin_critical_section(S_SESSION_TABLE);
if (ContextList == con) {
ToFree = ContextList;
ContextList = ContextList->next;
+ --num_sessions;
}
else {
for (ptr = ContextList; ptr != NULL; ptr = ptr->next) {
if (ptr->next == con) {
ToFree = ptr->next;
ptr->next = ptr->next->next;
+ --num_sessions;
}
}
}
ptr = mallok(sizeof(struct CtdlSessData));
ptr->sym_id = requested_sym;
ptr->sym_data = mallok(num_bytes);
+ memset(ptr->sym_data, 0, num_bytes);
begin_critical_section(S_SESSION_TABLE);
ptr->next = CC->FirstSessData;
lprintf(9, "Looking up hostname '%s'\n", from_host);
if ((strlen(from_host)>0) &&
(is_public_client(CC->cs_host))) {
- if (inet_aton(from_host, &addr))
+ if ((addr.s_addr = inet_addr(from_host)) != INADDR_NONE)
locate_host(CC->cs_host, &addr);
else {
safestrncpy(CC->cs_host, from_host, sizeof CC->cs_host);
/*
- *
+ * Back-end function for starting a session
*/
void begin_session(struct CitContext *con)
{
- int num_sessions, len;
+ int len;
struct sockaddr_in sin;
/*
time(&con->lastidle);
strcpy(con->lastcmdname, " ");
strcpy(con->cs_clientname, "(unknown)");
- strcpy(con->curr_user,"(not logged in)");
+ strcpy(con->curr_user, NLI);
strcpy(con->net_node,"");
snprintf(con->temp, sizeof con->temp, tmpnam(NULL));
safestrncpy(con->cs_host, config.c_fqdn, sizeof con->cs_host);
con->dl_is_net = 0;
con->FirstSessData = NULL;
- num_sessions = session_count();
con->nologin = 0;
if ((config.c_maxsessions > 0)&&(num_sessions > config.c_maxsessions))
con->nologin = 1;
- if (con->nologin==1) {
+ lprintf(3, "citserver[%3d]: started.\n", con->cs_pid);
+
+ /* Run any session startup routines registered by loadable modules */
+ PerformSessionHooks(EVT_START);
+
+ rec_log(CL_CONNECT, "");
+}
+
+
+void citproto_begin_session() {
+ if (CC->nologin==1) {
cprintf("%d %s: Too many users are already online "
"(maximum is %d)\n",
ERROR+MAX_SESSIONS_EXCEEDED,
cprintf("%d %s Citadel/UX server ready.\n",
OK, config.c_nodename);
}
-
- lprintf(3, "citserver[%3d]: started.\n", con->cs_pid);
-
- /* Run any session startup routines registered by loadable modules */
- PerformSessionHooks(EVT_START);
-
- rec_log(CL_CONNECT, "");
}