#include "housekeeping.h"
#include "user_ops.h"
#include "logging.h"
-#include "support.h"
#include "msgbase.h"
+#include "support.h"
#include "locate_host.h"
#include "room_ops.h"
#include "file_ops.h"
struct CitContext *ContextList = NULL;
int ScheduledShutdown = 0;
int do_defrag = 0;
-int (*CtdlSendExpressMessageFunc) (char *, char *, char *) = NULL;
/*
* Various things that need to be initialized at startup
lprintf(7, "cleanup_stuff() calling RemoveContext(%d)\n", CC->cs_pid);
RemoveContext(CC);
- /* While we still have an extra thread with no user attached to it,
- * take the opportunity to do some housekeeping before exiting.
- */
- do_housekeeping();
+ /* Wake up the housekeeping thread */
+ enter_housekeeping_cmd("SCHED_SHUTDOWN");
}
lprintf(9, "CtdlAllocUserData(%ld) called\n", requested_sym);
+ /* Fail silently if the symbol is already registered. */
for (ptr = CC->FirstSessData; ptr != NULL; ptr = ptr->next) {
if (ptr->sym_id == requested_sym) {
- lprintf(2, "ERROR: CtdlAllocUserData() requested for"
- " symbol id %ld already registered\n",
- requested_sym);
return;
}
}
+ /* Grab us some memory! Dem's good eatin' !! */
ptr = mallok(sizeof(struct CtdlSessData));
ptr->sym_id = requested_sym;
ptr->sym_data = mallok(num_bytes);
-/*
- * set_wtmpsupp() - alter the session listing
- */
-void set_wtmpsupp(char *newtext)
-{
- strncpy(CC->cs_room,newtext,sizeof CC->cs_room);
- CC->cs_room[sizeof CC->cs_room - 1] = 0;
- time(&CC->cs_lastupdt);
-
- /* Run any routines registered by loadable modules */
- PerformSessionHooks(EVT_NEWROOM);
- }
-
-
-/*
- * call set_wtmpsupp() with the name of the current room, modified a bit...
- */
-void set_wtmpsupp_to_current_room() {
- if (CC->quickroom.QRflags & QR_PRIVATE) {
- set_wtmpsupp("<private room>");
- }
- else if (CC->quickroom.QRflags & QR_MAILBOX) {
- set_wtmpsupp(&CC->quickroom.QRname[11]);
- }
- else {
- set_wtmpsupp(CC->quickroom.QRname);
- }
- }
-
-
/*
* cmd_info() - tell the client about this server
strncpy(CC->cs_clientname,desc,31);
CC->cs_clientname[31] = 0;
+ lprintf(9, "Looking up hostname\n");
if ((strlen(from_host)>0) &&
(is_public_client(CC->cs_host))) {
if (inet_aton(from_host, &addr))
CC->cs_host[24] = 0;
}
}
- set_wtmpsupp_to_current_room();
syslog(LOG_NOTICE,"client %d/%d/%01d.%02d (%s)\n",
dev_code,
CC->cs_flags = CC->cs_flags|CS_STEALTH;
}
- set_wtmpsupp_to_current_room();
cprintf("%d Ok\n",OK);
}
}
+/* Don't show the names of private rooms unless the viewing
+ * user also knows the rooms.
+ */
+void GenerateRoomDisplay(char *real_room,
+ struct CitContext *viewed,
+ struct CitContext *viewer) {
+
+ strcpy(real_room, viewed->quickroom.QRname);
+ if (viewed->quickroom.QRflags & QR_PRIVATE) {
+ if ( (CtdlRoomAccess(&viewed->quickroom, &viewer->usersupp)
+ & UA_KNOWN) == 0) {
+ strcpy(real_room, "<private room>");
+ }
+ }
+
+ if (viewed->cs_flags & CS_CHAT) {
+ while (strlen(real_room) < 14)
+ strcat(real_room, " ");
+
+ strcpy(&real_room[15], "<chat>");
+ }
+
+}
+
+
/*
* who's online
*/
struct CitContext *cptr;
int spoofed = 0;
int aide;
- char un[40], room[40], host[40], flags[5];
+ char un[40];
+ char real_room[ROOMNAMELEN], room[ROOMNAMELEN];
+ char host[40], flags[5];
aide = CC->usersupp.axlevel >= 6;
- cprintf("%d\n",LISTING_FOLLOWS);
+ cprintf("%d%c \n", LISTING_FOLLOWS, check_express() );
for (cptr = ContextList; cptr != NULL; cptr = cptr->next)
{
else
strcpy(host, cptr->cs_host);
- if (cptr->fake_roomname[0])
- {
- strcpy(room, cptr->fake_roomname);
- spoofed = 1;
+ GenerateRoomDisplay(real_room, cptr, CC);
+
+ if (cptr->fake_roomname[0]) {
+ strcpy(room, cptr->fake_roomname);
+ spoofed = 1;
+ }
+ else {
+ strcpy(room, real_room);
}
- else
- strcpy(room, cptr->cs_room);
-
if ((aide) && (spoofed))
strcat(flags, "+");
if ((spoofed) && (aide))
{
cprintf("%d|%s|%s|%s|%s|%ld|%s|%s\n",
- cptr->cs_pid, cptr->curr_user, cptr->cs_room,
+ 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");
}
}
else {
cprintf("%d Authentication failed.\n",ERROR);
+ lprintf(3, "Warning: ipgm authentication failed.\n");
}
}
*/
void cmd_down(void) {
if (!CC->logged_in) {
- cprintf("%d Not logged in.\n",ERROR+NOT_LOGGED_IN);
+ cprintf("%d Not logged in.\n", ERROR+NOT_LOGGED_IN);
return;
}
strcpy(CC->curr_user,"(not logged in)");
strcpy(CC->net_node,"");
snprintf(CC->temp, sizeof CC->temp, tmpnam(NULL));
- strcpy(CC->cs_room, "(no room)");
strncpy(CC->cs_host, config.c_fqdn, sizeof CC->cs_host);
CC->cs_host[sizeof CC->cs_host - 1] = 0;
len = sizeof sin;
cmd_gnur();
}
- else if (!strncasecmp(cmdbuf,"GREG",4)) {
- cmd_greg(&cmdbuf[5]);
- }
-
else if (!strncasecmp(cmdbuf,"VALI",4)) {
cmd_vali(&cmdbuf[5]);
}
cmd_list();
}
- else if (!strncasecmp(cmdbuf,"REGI",4)) {
- cmd_regi();
- }
-
else if (!strncasecmp(cmdbuf,"CHEK",4)) {
cmd_chek();
}
projects / citadel.git / blobdiff