#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>
check_ref_counts();
lprintf(7, "Creating base rooms (if necessary)\n");
- create_room(BASEROOM, 0, "", 0);
- create_room(AIDEROOM, 4, "", 0);
- create_room(config.c_twitroom, 0, "", 0);
+ create_room(BASEROOM, 0, "", 0);
+ create_room(AIDEROOM, 3, "", 0);
+ create_room(SYSCONFIGROOM, 3, "", 0);
+ create_room(config.c_twitroom, 0, "", 0);
}
/*
/* Cancel all running sessions */
lprintf(7, "Cancelling running sessions...\n");
-/* FIX do something here
+/* FIXME do something here
while (ContextList != NULL) {
}
*/
}
/* 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;
}
}
}
return;
}
+ /* Run any cleanup routines registered by loadable modules.
+ * Note 1: This must occur *before* deallocate_user_data() because the
+ * cleanup functions might touch dynamic session data.
+ * Note 2: We have to "become_session()" because the cleanup functions
+ * might make references to "CC" assuming it's the right one.
+ */
+ become_session(con);
+ PerformSessionHooks(EVT_STOP);
+ become_session(NULL);
+
/* Now handle all of the administrivia. */
lprintf(7, "Calling logout(%d)\n", con->cs_pid);
logout(con);
unlink(con->temp);
lprintf(3, "citserver[%3d]: ended.\n", con->cs_pid);
- /* Run any cleanup routines registered by loadable modules */
- PerformSessionHooks(EVT_STOP);
syslog(LOG_NOTICE,"session %d ended", con->cs_pid);
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;
}
+/*
+ * Change the size of a buffer allocated with CtdlAllocUserData()
+ */
+void CtdlReallocUserData(unsigned long requested_sym, size_t num_bytes)
+{
+ struct CtdlSessData *ptr;
+
+ for (ptr = CC->FirstSessData; ptr != NULL; ptr = ptr->next) {
+ if (ptr->sym_id == requested_sym) {
+ ptr->sym_data = reallok(ptr->sym_data, num_bytes);
+ return;
+ }
+ }
+
+ lprintf(2, "CtdlReallocUserData() ERROR: symbol %ld not found!\n",
+ requested_sym);
+}
+
+
* returns an asterisk if there are any express messages waiting,
* space otherwise.
*/
-char check_express(void) {
+char CtdlCheckExpress(void) {
if (CC->FirstExpressMessage == NULL) {
return(' ');
}
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);
}
-/*
- * who's online
- */
-void cmd_rwho(void) {
- struct CitContext *cptr;
- int spoofed = 0;
- int aide;
- char un[40];
- char real_room[ROOMNAMELEN], room[ROOMNAMELEN];
- char host[40], flags[5];
-
- aide = CC->usersupp.axlevel >= 6;
- cprintf("%d%c \n", LISTING_FOLLOWS, check_express() );
-
- for (cptr = ContextList; cptr != NULL; cptr = cptr->next)
- {
- flags[0] = '\0';
- spoofed = 0;
-
- if (cptr->cs_flags & CS_POSTING)
- strcat(flags, "*");
- else
- strcat(flags, ".");
-
- if (cptr->fake_username[0])
- {
- strcpy(un, cptr->fake_username);
- spoofed = 1;
- }
- else
- strcpy(un, cptr->curr_user);
-
- if (cptr->fake_hostname[0])
- {
- strcpy(host, cptr->fake_hostname);
- spoofed = 1;
- }
- else
- strcpy(host, cptr->cs_host);
-
- GenerateRoomDisplay(real_room, cptr, CC);
-
- if (cptr->fake_roomname[0]) {
- strcpy(room, cptr->fake_roomname);
- spoofed = 1;
- }
- else {
- strcpy(room, real_room);
- }
-
- if ((aide) && (spoofed))
- strcat(flags, "+");
-
- if ((cptr->cs_flags & CS_STEALTH) && (aide))
- strcat(flags, "-");
-
- if (((cptr->cs_flags&CS_STEALTH)==0) || (aide))
- {
- cprintf("%d|%s|%s|%s|%s|%ld|%s|%s\n",
- cptr->cs_pid, un, room,
- host, cptr->cs_clientname,
- (long)(cptr->lastidle),
- cptr->lastcmdname, flags);
- }
- if ((spoofed) && (aide))
- {
- cprintf("%d|%s|%s|%s|%s|%ld|%s|%s\n",
- cptr->cs_pid, cptr->curr_user,
- real_room,
- cptr->cs_host, cptr->cs_clientname,
- (long)(cptr->lastidle),
- cptr->lastcmdname, flags);
-
- }
- }
-
- /* Now it's magic time. Before we finish, call any EVT_RWHO hooks
- * so that external paging modules such as serv_icq can add more
- * content to the Wholist.
- */
- PerformSessionHooks(EVT_RWHO);
- cprintf("000\n");
- }
-
/*
* Terminate another running session
/*
- *
+ * 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, "");
}
}
if (!strncasecmp(cmdbuf,"NOOP",4)) {
- cprintf("%d%cok\n",OK,check_express());
+ cprintf("%d%cok\n",OK,CtdlCheckExpress());
}
else if (!strncasecmp(cmdbuf,"QUIT",4)) {
cmd_netf(&cmdbuf[5]);
}
- else if (!strncasecmp(cmdbuf,"RWHO",4)) {
- cmd_rwho();
- }
-
else if (!strncasecmp(cmdbuf,"OPEN",4)) {
cmd_open(&cmdbuf[5]);
}