#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>
return;
}
- lprintf(7, "Calling logout(%d)\n", con->cs_pid);
- logout(con);
-
- rec_log(CL_TERMINATE, con->curr_user);
- 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);
-
- /* Deallocate any user-data attached to this session */
- deallocate_user_data(con);
-
- /* delete context */
-
- lprintf(7, "Removing context\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);
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;
}
}
}
end_critical_section(S_SESSION_TABLE);
- lprintf(7, "Closing socket %d\n", ToFree->client_socket);
- close(ToFree->client_socket);
+ if (ToFree == NULL) {
+ lprintf(9, "RemoveContext() found nothing to remove\n");
+ return;
+ }
+
+ /* Now handle all of the administrivia. */
+ lprintf(7, "Calling logout(%d)\n", con->cs_pid);
+ logout(con);
+
+ rec_log(CL_TERMINATE, con->curr_user);
+ 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);
+
+ /* 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);
+ close(con->client_socket);
/* Tell the housekeeping thread to check to see if this is the time
* to initiate a scheduled shutdown event.
enter_housekeeping_cmd("SCHED_SHUTDOWN");
/* Free up the memory used by this context */
- phree(ToFree);
+ phree(con);
lprintf(7, "Done with RemoveContext()\n");
}
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;
void cmd_rchg(char *argbuf)
{
- char newroomname[ROOMNAMELEN];
+ char newroomname[256];
extract(newroomname, argbuf, 0);
- newroomname[ROOMNAMELEN] = 0;
+ newroomname[ROOMNAMELEN-1] = 0;
if (strlen(newroomname) > 0) {
- safestrncpy(CC->fake_roomname, newroomname,
+ safestrncpy(CC->fake_roomname, newroomname,
sizeof(CC->fake_roomname) );
- CC->fake_roomname[ROOMNAMELEN - 1] = 0;
}
else {
strcpy(CC->fake_roomname, "");
cprintf("%d OK\n", OK);
}
-void cmd_hchg(char *newhostname)
+void cmd_hchg(char *argbuf)
{
- if ((newhostname) && (newhostname[0]))
- {
- memset(CC->fake_hostname, 0, 25);
- safestrncpy(CC->fake_hostname, newhostname, sizeof(CC->fake_hostname));
- }
- else
- strcpy(CC->fake_hostname, "");
- cprintf("%d OK\n",OK);
+ char newhostname[256];
+
+ extract(newhostname, argbuf, 0);
+ if (strlen(newhostname) > 0) {
+ safestrncpy(CC->fake_hostname, newhostname,
+ sizeof(CC->fake_hostname) );
+ }
+ else {
+ strcpy(CC->fake_hostname, "");
+ }
+ cprintf("%d OK\n", OK);
}
-void cmd_uchg(char *newusername)
+void cmd_uchg(char *argbuf)
{
- if (CC->usersupp.axlevel < 6)
- {
- cprintf("%d You must be an Aide to use UCHG.\n",
- ERROR+HIGHER_ACCESS_REQUIRED);
- return;
- }
- if ((newusername) && (newusername[0]))
- {
- CC->cs_flags &= ~CS_STEALTH;
- memset(CC->fake_username, 0, 32);
- if (strncasecmp(newusername, CC->curr_user, strlen(CC->curr_user)))
- safestrncpy(CC->fake_username, newusername, sizeof(CC->fake_username));
- }
- else
- {
- CC->fake_username[0] = '\0';
- CC->cs_flags |= CS_STEALTH;
- }
- cprintf("%d\n",OK);
+
+ char newusername[256];
+
+ extract(newusername, argbuf, 0);
+
+ if (CC->usersupp.axlevel < 6) {
+ cprintf("%d You must be an Aide to masquerade your name.\n",
+ ERROR+HIGHER_ACCESS_REQUIRED);
+ return;
+ }
+
+ if (strlen(newusername) > 0) {
+ CC->cs_flags &= ~CS_STEALTH;
+ memset(CC->fake_username, 0, 32);
+ if (strncasecmp(newusername, CC->curr_user,
+ strlen(CC->curr_user)))
+ safestrncpy(CC->fake_username, newusername,
+ sizeof(CC->fake_username));
+ }
+ else {
+ CC->fake_username[0] = '\0';
+ CC->cs_flags |= CS_STEALTH;
+ }
+ cprintf("%d\n",OK);
}
+
+
/*
* returns an asterisk if there are any express messages waiting,
* space otherwise.
safestrncpy(CC->cs_clientname, desc, sizeof CC->cs_clientname);
CC->cs_clientname[31] = 0;
- lprintf(9, "Looking up hostname\n");
+ 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, "");
}
projects / citadel.git / blobdiff