#endif
struct CitContext *ContextList = NULL;
+struct CitContext* next_session = NULL;
char *unique_session_numbers;
int ScheduledShutdown = 0;
int do_defrag = 0;
FILE *urandom;
struct ctdlroom qrbuf;
- lprintf(9, "master_startup() started\n");
+ lprintf(CTDL_DEBUG, "master_startup() started\n");
time(&server_startup_time);
- lprintf(7, "Opening databases\n");
+ lprintf(CTDL_INFO, "Opening databases\n");
open_databases();
if (do_defrag) {
check_ref_counts();
- lprintf(7, "Creating base rooms (if necessary)\n");
+ lprintf(CTDL_INFO, "Creating base rooms (if necessary)\n");
create_room(BASEROOM, 0, "", 0, 1, 0);
create_room(AIDEROOM, 3, "", 0, 1, 0);
create_room(SYSCONFIGROOM, 3, "", 0, 1, 0);
lputroom(&qrbuf);
}
- lprintf(7, "Seeding the pseudo-random number generator...\n");
+ lprintf(CTDL_INFO, "Seeding the pseudo-random number generator...\n");
urandom = fopen("/dev/urandom", "r");
if (urandom != NULL) {
fread(&seed, sizeof seed, 1, urandom);
}
srandom(seed);
- lprintf(7, "Initializing ipgm secret\n");
+ lprintf(CTDL_INFO, "Initializing ipgm secret\n");
get_config();
config.c_ipgm_secret = rand();
put_config();
- lprintf(9, "master_startup() finished\n");
+ lprintf(CTDL_DEBUG, "master_startup() finished\n");
}
}
/* Close databases */
- lprintf(7, "Closing databases\n");
+ lprintf(CTDL_INFO, "Closing databases\n");
close_databases();
/* Do system-dependent stuff */
sysdep_master_cleanup();
+#ifdef DEBUG_MEMORY_LEAKS
+ dump_heap();
+#endif
+
/* Now go away. */
- lprintf(3, "citserver: exiting.\n");
+ lprintf(CTDL_NOTICE, "citserver: exiting.\n");
fflush(stdout); fflush(stderr);
exit(0);
}
begin_critical_section(S_SESSION_TABLE);
while (con->FirstSessData != NULL) {
- lprintf(9, "Deallocating user data symbol %ld\n",
+ lprintf(CTDL_DEBUG, "Deallocating user data symbol %ld\n",
con->FirstSessData->sym_id);
if (con->FirstSessData->sym_data != NULL)
- phree(con->FirstSessData->sym_data);
+ free(con->FirstSessData->sym_data);
ptr = con->FirstSessData->next;
- phree(con->FirstSessData);
+ free(con->FirstSessData);
con->FirstSessData = ptr;
}
end_critical_section(S_SESSION_TABLE);
struct CitContext *ToFree = NULL;
if (con==NULL) {
- lprintf(5, "WARNING: RemoveContext() called with NULL!\n");
+ lprintf(CTDL_ERR, "WARNING: RemoveContext() called with NULL!\n");
return;
}
- lprintf(9, "RemoveContext() called\n");
+ lprintf(CTDL_DEBUG, "RemoveContext() called\n");
/* Remove the context from the global context list. This needs
* 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);
+ lprintf(CTDL_DEBUG, "Removing context for session %d\n", con->cs_pid);
begin_critical_section(S_SESSION_TABLE);
if (ContextList == con) {
ToFree = ContextList;
else {
for (ptr = ContextList; ptr != NULL; ptr = ptr->next) {
if (ptr->next == con) {
+ /* See fair scheduling in sysdep.c */
+ if (next_session == ptr->next)
+ next_session = ptr->next->next;
ToFree = ptr->next;
ptr->next = ptr->next->next;
--num_sessions;
end_critical_section(S_SESSION_TABLE);
if (ToFree == NULL) {
- lprintf(9, "RemoveContext() found nothing to remove\n");
+ lprintf(CTDL_DEBUG, "RemoveContext() found nothing to remove\n");
return;
}
become_session(NULL);
/* Now handle all of the administrivia. */
- lprintf(7, "Calling logout(%d)\n", con->cs_pid);
+ lprintf(CTDL_DEBUG, "Calling logout(%d)\n", con->cs_pid);
logout(con);
unlink(con->temp);
- lprintf(3, "Session %d: ended.\n", con->cs_pid);
+ lprintf(CTDL_NOTICE, "Session %d: ended.\n", con->cs_pid);
/* Deallocate any user-data attached to this session */
deallocate_user_data(con);
/* If the client is still connected, blow 'em away. */
- lprintf(7, "Closing socket %d\n", con->client_socket);
+ lprintf(CTDL_DEBUG, "Closing socket %d\n", con->client_socket);
close(con->client_socket);
/* This is where we used to check for scheduled shutdowns. */
/* Free up the memory used by this context */
- phree(con);
+ free(con);
- lprintf(9, "Done with RemoveContext()\n");
+ lprintf(CTDL_DEBUG, "Done with RemoveContext()\n");
}
if (ptr->sym_id == requested_sym)
return(ptr->sym_data);
- lprintf(2, "ERROR! CtdlGetUserData(%ld) symbol not allocated\n",
+ lprintf(CTDL_ERR, "ERROR! CtdlGetUserData(%ld) symbol not allocated\n",
requested_sym);
return NULL;
}
{
struct CtdlSessData *ptr;
- lprintf(9, "CtdlAllocUserData(%ld) called\n", requested_sym);
+ lprintf(CTDL_DEBUG, "CtdlAllocUserData(%ld) called\n", requested_sym);
/* Fail silently if the symbol is already registered. */
for (ptr = CC->FirstSessData; ptr != NULL; ptr = ptr->next) {
}
/* Grab us some memory! Dem's good eatin' !! */
- ptr = mallok(sizeof(struct CtdlSessData));
+ ptr = malloc(sizeof(struct CtdlSessData));
ptr->sym_id = requested_sym;
- ptr->sym_data = mallok(num_bytes);
+ ptr->sym_data = malloc(num_bytes);
memset(ptr->sym_data, 0, num_bytes);
begin_critical_section(S_SESSION_TABLE);
CC->FirstSessData = ptr;
end_critical_section(S_SESSION_TABLE);
- lprintf(9, "CtdlAllocUserData(%ld) finished\n", requested_sym);
+ lprintf(CTDL_DEBUG, "CtdlAllocUserData(%ld) finished\n", requested_sym);
}
for (ptr = CC->FirstSessData; ptr != NULL; ptr = ptr->next) {
if (ptr->sym_id == requested_sym) {
- ptr->sym_data = reallok(ptr->sym_data, num_bytes);
+ ptr->sym_data = realloc(ptr->sym_data, num_bytes);
return;
}
}
- lprintf(2, "CtdlReallocUserData() ERROR: symbol %ld not found!\n",
+ lprintf(CTDL_ERR, "CtdlReallocUserData() ERROR: symbol %ld not found!\n",
requested_sym);
}
/*
- * returns an asterisk if there are any express messages waiting,
+ * returns an asterisk if there are any instant messages waiting,
* space otherwise.
*/
char CtdlCheckExpress(void) {
*/
if (stat(PUBLIC_CLIENTS, &statbuf) != 0) {
/* No public_clients file exists, so bail out */
- lprintf(5, "Warning: '%s' does not exist\n", PUBLIC_CLIENTS);
+ lprintf(CTDL_WARNING, "Warning: '%s' does not exist\n", PUBLIC_CLIENTS);
return(0);
}
if (statbuf.st_mtime > pc_timestamp) {
begin_critical_section(S_PUBLIC_CLIENTS);
- lprintf(7, "Loading %s\n", PUBLIC_CLIENTS);
+ lprintf(CTDL_INFO, "Loading %s\n", PUBLIC_CLIENTS);
strcpy(public_clients, "127.0.0.1");
if (hostname_to_dotted_quad(addrbuf, config.c_fqdn) == 0) {
end_critical_section(S_PUBLIC_CLIENTS);
}
- lprintf(9, "Checking whether %s is a local or public client\n",
+ lprintf(CTDL_DEBUG, "Checking whether %s is a local or public client\n",
CC->cs_addr);
for (i=0; i<num_parms(public_clients); ++i) {
extract(addrbuf, public_clients, i);
if (!strcasecmp(CC->cs_addr, addrbuf)) {
- lprintf(9, "... yes it is.\n");
+ lprintf(CTDL_DEBUG, "... yes it is.\n");
return(1);
}
}
/* No hits. This is not a public client. */
- lprintf(9, "... no it isn't.\n");
+ lprintf(CTDL_DEBUG, "... no it isn't.\n");
return(0);
}
}
if (do_lookup) {
- lprintf(9, "Looking up hostname '%s'\n", from_host);
+ lprintf(CTDL_DEBUG, "Looking up hostname '%s'\n", from_host);
if ((addr.s_addr = inet_addr(from_host)) != -1) {
locate_host(CC->cs_host, sizeof CC->cs_host,
NULL, 0,
}
}
- lprintf(3,"Session %d: Client %d/%d/%01d.%02d (%s) from %s\n",
- CC->cs_pid,
+ lprintf(CTDL_NOTICE, "Client %d/%d/%01d.%02d (%s) from %s\n",
dev_code,
cli_code,
(rev_level / 100),
extract(buf,mname,0);
- dirs[0]=mallok(64);
- dirs[1]=mallok(64);
+ dirs[0]=malloc(64);
+ dirs[1]=malloc(64);
strcpy(dirs[0],"messages");
strcpy(dirs[1],"help");
snprintf(buf2, sizeof buf2, "%s.%d.%d", buf, CC->cs_clientdev, CC->cs_clienttyp);
mesg_locate(targ,sizeof targ,buf,2,(const char **)dirs);
}
}
- phree(dirs[0]);
- phree(dirs[1]);
+ free(dirs[0]);
+ free(dirs[1]);
if (strlen(targ)==0) {
cprintf("%d '%s' not found.\n",ERROR + FILE_NOT_FOUND, mname);
if (buf[a] == '/') buf[a] = '.';
}
- dirs[0]=mallok(64);
- dirs[1]=mallok(64);
+ dirs[0]=malloc(64);
+ dirs[1]=malloc(64);
strcpy(dirs[0],"messages");
strcpy(dirs[1],"help");
mesg_locate(targ,sizeof targ,buf,2,(const char**)dirs);
- phree(dirs[0]);
- phree(dirs[1]);
+ free(dirs[0]);
+ free(dirs[1]);
if (strlen(targ)==0) {
snprintf(targ, sizeof targ, "./help/%s", buf);
return;
}
- lprintf(9, "Locating session to kill\n");
+ lprintf(CTDL_DEBUG, "Locating session to kill\n");
begin_critical_section(S_SESSION_TABLE);
for (ccptr = ContextList; ccptr != NULL; ccptr = ccptr->next) {
if (session_num == ccptr->cs_pid) {
else {
sleep(5);
cprintf("%d Authentication failed.\n", ERROR + PASSWORD_REQUIRED);
- lprintf(3, "Warning: ipgm authentication failed.\n");
+ lprintf(CTDL_ERR, "Warning: ipgm authentication failed.\n");
CC->kill_me = 1;
}
if ((config.c_maxsessions > 0)&&(num_sessions > config.c_maxsessions))
con->nologin = 1;
- lprintf(3, "Session %d: started.\n", con->cs_pid);
+ lprintf(CTDL_NOTICE, "Session started.\n");
/* Run any session startup routines registered by loadable modules */
PerformSessionHooks(EVT_START);
config.c_nodename, config.c_maxsessions);
}
else {
- cprintf("%d %s Citadel/UX server ready.\n",
+ cprintf("%d %s Citadel server ready.\n",
CIT_OK, config.c_nodename);
}
}
time(&CC->lastcmd);
memset(cmdbuf, 0, sizeof cmdbuf); /* Clear it, just in case */
if (client_gets(cmdbuf) < 1) {
- lprintf(3, "Client socket is broken. Ending session.\n");
+ lprintf(CTDL_ERR, "Client socket is broken; ending session\n");
CC->kill_me = 1;
return;
}
- lprintf(5, "Citadel: %s\n", cmdbuf);
+ lprintf(CTDL_INFO, "Citadel: %s\n", cmdbuf);
/*
* Let other clients see the last command we executed, and
}
if (!strncasecmp(cmdbuf,"NOOP",4)) {
- cprintf("%d%cok\n",CIT_OK,CtdlCheckExpress());
+ cprintf("%d%cok\n", CIT_OK, CtdlCheckExpress() );
}
else if (!strncasecmp(cmdbuf,"QNOP",4)) {
}
else if (!strncasecmp(cmdbuf,"QUIT",4)) {
- cprintf("%d Goodbye.\n",CIT_OK);
+ cprintf("%d Goodbye.\n", CIT_OK);
CC->kill_me = 1;
}
else if (!strncasecmp(cmdbuf,"LOUT",4)) {
if (CC->logged_in) logout(CC);
- cprintf("%d logged out.\n",CIT_OK);
+ cprintf("%d logged out.\n", CIT_OK);
}
else if (!strncasecmp(cmdbuf,"USER",4)) {
cmd_isme(&cmdbuf[5]);
}
-#ifdef DEBUG_MEMORY_LEAKS
- else if (!strncasecmp(cmdbuf, "LEAK", 4)) {
- dump_tracked();
- }
-#endif
-
else if (!DLoader_Exec_Cmd(cmdbuf)) {
- cprintf("%d Unrecognized or unsupported command.\n", ERROR + CMD_NOT_SUPPORTED);
+ cprintf("%d Unrecognized or unsupported command.\n",
+ ERROR + CMD_NOT_SUPPORTED);
}
- /* Run any after-each-command outines registered by modules */
+ /* Run any after-each-command routines registered by modules */
PerformSessionHooks(EVT_CMD);
}
+
+
+/*
+ * This loop performs all asynchronous functions.
+ */
+void do_async_loop(void) {
+ PerformSessionHooks(EVT_ASYNC);
+}
projects / citadel.git / blobdiff