/*
+ * $Id$
+ *
* Citadel/UX "system dependent" stuff.
* See copyright.txt for copyright information.
*
- * $Id$
- *
- * Here's where we (hopefully) have all the parts of the Citadel server that
+ * Here's where we (hopefully) have most parts of the Citadel server that
* would need to be altered to run the server in a non-POSIX environment.
*
- * Eventually we'll try porting to a different platform and either have
- * multiple variants of this file or simply load it up with #ifdefs.
+ * If we ever port to a different platform and either have multiple
+ * variants of this file or simply load it up with #ifdefs.
+ *
*/
if (loglevel <= verbosity) {
fprintf(stderr, "%s", buf);
fflush(stderr);
- }
+ }
PerformLogHooks(loglevel, buf);
- }
+}
hptr->h_ptr = ptr;
heap = hptr;
return ptr;
- }
+}
char *tracked_strdup(const char *orig, char *tfile, int tline) {
char *s;
hptr = heap->next;
free(heap);
heap = hptr;
- }
+ }
else {
for (hptr=heap; hptr->next!=NULL; hptr=hptr->next) {
if (hptr->next->h_ptr == ptr) {
freeme = hptr->next;
hptr->next = hptr->next->next;
free(freeme);
- }
}
}
+ }
free(ptr);
- }
+}
void *tracked_realloc(void *ptr, size_t size) {
void *newptr;
for (hptr=heap; hptr!=NULL; hptr=hptr->next) {
if (hptr->h_ptr == ptr) hptr->h_ptr = newptr;
- }
+ }
return newptr;
- }
+}
void dump_tracked() {
for (hptr=heap; hptr!=NULL; hptr=hptr->next) {
cprintf("%20s %5d\n",
hptr->h_file, hptr->h_line);
- }
+ }
#ifdef __GNUC__
malloc_stats();
#endif
cprintf("000\n");
- }
+}
#endif
/*
- * we used to use master_cleanup() as a signal handler to shut down the server.
+ * We used to use master_cleanup() as a signal handler to shut down the server.
* however, master_cleanup() and the functions it calls do some things that
* aren't such a good idea to do from a signal handler: acquiring mutexes,
* playing with signal masks on BSDI systems, etc. so instead we install the
/*
* Set up a place to put thread-specific data.
* We only need a single pointer per thread - it points to the
- * thread's CitContext structure in the ContextList linked list.
+ * CitContext structure (in the ContextList linked list) of the
+ * session to which the calling thread is currently bound.
*/
if (pthread_key_create(&MyConKey, NULL) != 0) {
lprintf(1, "Can't create TSD key!! %s\n", strerror(errno));
{
struct sockaddr_in sin;
int s, i;
+ int actual_queue_len;
+
+ actual_queue_len = queue_len;
+ if (actual_queue_len < 5) actual_queue_len = 5;
memset(&sin, 0, sizeof(sin));
sin.sin_family = AF_INET;
if (bind(s, (struct sockaddr *)&sin, sizeof(sin)) < 0) {
lprintf(1, "citserver: Can't bind: %s\n",
strerror(errno));
+ close(s);
return(-1);
}
- if (listen(s, queue_len) < 0) {
+ if (listen(s, actual_queue_len) < 0) {
lprintf(1, "citserver: Can't listen: %s\n", strerror(errno));
+ close(s);
return(-1);
}
{
struct sockaddr_un addr;
int s;
+ int i;
+ int actual_queue_len;
- unlink(sockpath);
+ actual_queue_len = queue_len;
+ if (actual_queue_len < 5) actual_queue_len = 5;
+
+ i = unlink(sockpath);
+ if (i != 0) if (errno != ENOENT) {
+ lprintf(1, "citserver: can't unlink %s: %s\n",
+ sockpath, strerror(errno));
+ return(-1);
+ }
memset(&addr, 0, sizeof(addr));
addr.sun_family = AF_UNIX;
return(-1);
}
- if (listen(s, queue_len) < 0) {
+ if (listen(s, actual_queue_len) < 0) {
lprintf(1, "citserver: Can't listen: %s\n", strerror(errno));
return(-1);
}
/*
- * Initialize a new context and place it in the list.
+ * Initialize a new context and place it in the list. The session number
+ * used to be the PID (which is why it's called cs_pid), but that was when we
+ * had one process per session. Now we just assign them sequentially, starting
+ * at 1 (don't change it to 0 because masterCC uses 0) and re-using them when
+ * sessions terminate.
*/
struct CitContext *CreateNewContext(void) {
struct CitContext *me, *ptr;
buf[i] = 0;
while ((strlen(buf)>0)&&(!isprint(buf[strlen(buf)-1])))
buf[strlen(buf)-1] = 0;
+ if (retval < 0) strcpy(buf, "000");
return(retval);
}
*/
for (serviceptr = ServiceHookTable; serviceptr != NULL;
serviceptr = serviceptr->next ) {
- lprintf(3, "Closing listener on port %d\n",
- serviceptr->tcp_port);
+
+ if (serviceptr->tcp_port > 0)
+ lprintf(3, "Closing listener on port %d\n",
+ serviceptr->tcp_port);
+
+ if (serviceptr->sockpath != NULL)
+ lprintf(3, "Closing listener on '%s'\n",
+ serviceptr->sockpath);
+
close(serviceptr->msock);
/* If it's a Unix domain socket, remove the file. */
void InitializeMasterCC(void) {
memset(&masterCC, 0, sizeof(struct CitContext));
masterCC.internal_pgm = 1;
+ masterCC.cs_pid = 0;
+}
+
+
+
+/*
+ * Set up a fd_set containing all the master sockets to which we
+ * always listen. It's computationally less expensive to just copy
+ * this to a local fd_set when starting a new select() and then add
+ * the client sockets than it is to initialize a new one and then
+ * figure out what to put there.
+ */
+void init_master_fdset(void) {
+ struct ServiceFunctionHook *serviceptr;
+ int m;
+
+ lprintf(9, "Initializing master fdset\n");
+
+ FD_ZERO(&masterfds);
+ masterhighest = 0;
+
+ lprintf(9, "Will listen on rescan pipe %d\n", rescan[0]);
+ FD_SET(rescan[0], &masterfds);
+ if (rescan[0] > masterhighest) masterhighest = rescan[0];
+
+ for (serviceptr = ServiceHookTable; serviceptr != NULL;
+ serviceptr = serviceptr->next ) {
+ m = serviceptr->msock;
+ lprintf(9, "Will listen on master socket %d\n", m);
+ FD_SET(m, &masterfds);
+ if (m > masterhighest) {
+ masterhighest = m;
+ }
+ }
+ lprintf(9, "masterhighest = %d\n", masterhighest);
}
struct passwd *pw;
int drop_root_perms = 1;
char *moddir;
- struct ServiceFunctionHook *serviceptr;
/* specify default port name and trace file */
strcpy(tracefile, "");
/* Tell 'em who's in da house */
lprintf(1,
"\nMultithreaded message server for Citadel/UX\n"
-"Copyright (C) 1987-1999 by the Citadel/UX development team.\n"
+"Copyright (C) 1987-2000 by the Citadel/UX development team.\n"
"Citadel/UX is free software, covered by the GNU General Public License, and\n"
"you are welcome to change it and/or distribute copies of it under certain\n"
"conditions. There is absolutely no warranty for this software. Please\n"
/* Initialize... */
init_sysdep();
- openlog("citserver",LOG_PID,LOG_USER);
+ openlog("citserver", LOG_PID, LOG_USER);
/* Load site-specific parameters */
lprintf(7, "Loading citadel.config\n");
master_startup();
/*
- * Bind the server to our favorite ports.
+ * Bind the server to a Unix-domain socket.
*/
- CtdlRegisterServiceHook(config.c_port_number, /* TCP */
- NULL,
+ CtdlRegisterServiceHook(0,
+ "citadel.socket",
citproto_begin_session,
do_command_loop);
- CtdlRegisterServiceHook(0, /* TCP */
- "citadel.socket",
+
+ /*
+ * Bind the server to our favorite TCP port (usually 504).
+ */
+ CtdlRegisterServiceHook(config.c_port_number,
+ NULL,
citproto_begin_session,
do_command_loop);
exit(errno);
}
- /*
- * Set up a fd_set containing all the master sockets to which we
- * always listen. It's computationally less expensive to just copy
- * this to a local fd_set when starting a new select() and then add
- * the client sockets than it is to initialize a new one and then
- * figure out what to put there.
- */
- FD_ZERO(&masterfds);
- masterhighest = 0;
- FD_SET(rescan[0], &masterfds);
- if (rescan[0] > masterhighest) masterhighest = rescan[0];
-
- for (serviceptr = ServiceHookTable; serviceptr != NULL;
- serviceptr = serviceptr->next ) {
- FD_SET(serviceptr->msock, &masterfds);
- if (serviceptr->msock > masterhighest) {
- masterhighest = serviceptr->msock;
- }
- }
-
+ init_master_fdset();
/*
* Now that we've bound the sockets, change to the BBS user id and its
/*
- * Bind a thread to a context.
+ * Bind a thread to a context. (It's inline merely to speed things up.)
*/
inline void become_session(struct CitContext *which_con) {
pthread_setspecific(MyConKey, (void *)which_con );
* calling select() and then they'd all wake up at once. We
* solve this problem by putting the select() in a critical
* section, so only one thread has the opportunity to wake
- * up. If we wake up on the master socket, create a new
+ * up. If we wake up on a master socket, create a new
* session context; otherwise, just bind the thread to the
* context we want and go on our merry way.
*/
begin_critical_section(S_I_WANNA_SELECT);
-SETUP_FD: memcpy(&readfds, &masterfds, sizeof(fd_set) );
+SETUP_FD: memcpy(&readfds, &masterfds, sizeof masterfds);
highest = masterhighest;
begin_critical_section(S_SESSION_TABLE);
for (ptr = ContextList; ptr != NULL; ptr = ptr->next) {
}
/* Next, check to see if it's a new client connecting
- * on the master socket.
+ * on a master socket.
*/
else for (serviceptr = ServiceHookTable; serviceptr != NULL;
serviceptr = serviceptr->next ) {
con->client_socket = ssock;
con->h_command_function =
serviceptr->h_command_function;
+
+ /* Determine whether local socket */
+ if (serviceptr->sockpath != NULL)
+ con->is_local_socket = 1;
/* Set the SO_REUSEADDR socket option */
i = 1;
* thread that the &readfds needs to be refreshed with more
* current data.
*/
- if (!time_to_die) if (FD_ISSET(rescan[0], &readfds)) {
+ if (time_to_die)
+ break;
+
+ if (FD_ISSET(rescan[0], &readfds)) {
read(rescan[0], &junk, 1);
goto SETUP_FD;
}
/* We're bound to a session, now do *one* command */
if (bind_me != NULL) {
become_session(bind_me);
+ cdb_begin_transaction();
CC->h_command_function();
+ cdb_end_transaction();
become_session(NULL);
bind_me->state = CON_IDLE;
if (bind_me->kill_me == 1) {