pthread_mutex_t Critters[MAX_SEMAPHORES]; /* Things needing locking */
pthread_key_t MyConKey; /* TSD key for MyContext() */
-int msock; /* master listening socket */
int verbosity = DEFAULT_VERBOSITY; /* Logging level */
struct CitContext masterCC;
int num_threads = 0; /* Current number of threads */
int num_sessions = 0; /* Current number of sessions */
+fd_set masterfds; /* Master sockets etc. */
+int masterhighest;
+
+
/*
* lprintf() ... Write logging information
*/
sin.sin_addr.s_addr = INADDR_ANY;
if (port_number == 0) {
- lprintf(1,
- "citserver: No port number specified. Run setup.\n");
- exit(1);
+ lprintf(1, "citserver: illegal port number specified\n");
+ return(-1);
}
sin.sin_port = htons((u_short)port_number);
if (s < 0) {
lprintf(1, "citserver: Can't create a socket: %s\n",
strerror(errno));
- exit(errno);
+ return(-1);
}
/* Set the SO_REUSEADDR socket option, because it makes sense. */
if (bind(s, (struct sockaddr *)&sin, sizeof(sin)) < 0) {
lprintf(1, "citserver: Can't bind: %s\n", strerror(errno));
- exit(errno);
+ return(-1);
}
if (listen(s, queue_len) < 0) {
lprintf(1, "citserver: Can't listen: %s\n", strerror(errno));
- exit(errno);
+ return(-1);
}
return(s);
* The system-dependent part of master_cleanup() - close the master socket.
*/
void sysdep_master_cleanup(void) {
- lprintf(7, "Closing master socket %d\n", msock);
- close(msock);
+ /* FIX close all protocol master sockets here */
}
struct passwd *pw;
int drop_root_perms = 1;
char *moddir;
+ struct ServiceFunctionHook *serviceptr;
/* specify default port name and trace file */
strcpy(tracefile, "");
get_config();
/*
- * Bind the server to our favourite port.
- * There is no need to check for errors, because ig_tcp_server()
- * exits if it doesn't succeed.
- */
- lprintf(7, "Attempting to bind to port %d...\n", config.c_port_number);
- msock = ig_tcp_server(config.c_port_number, 5);
- lprintf(7, "Listening on socket %d\n", msock);
-
- /*
- * Now that we've bound the socket, change to the BBS user id and its
- * corresponding group ids
+ * Do non system dependent startup functions.
*/
- if (drop_root_perms) {
- if ((pw = getpwuid(BBSUID)) == NULL)
- lprintf(1, "WARNING: getpwuid(%d): %s\n"
- "Group IDs will be incorrect.\n", BBSUID,
- strerror(errno));
- else {
- initgroups(pw->pw_name, pw->pw_gid);
- if (setgid(pw->pw_gid))
- lprintf(3, "setgid(%d): %s\n", pw->pw_gid,
- strerror(errno));
- }
- lprintf(7, "Changing uid to %d\n", BBSUID);
- if (setuid(BBSUID) != 0) {
- lprintf(3, "setuid() failed: %s\n", strerror(errno));
- }
- }
+ master_startup();
/*
- * Do non system dependent startup functions.
+ * Bind the server to our favorite ports.
*/
- master_startup();
+ CtdlRegisterServiceHook(config.c_port_number,
+ citproto_begin_session,
+ do_command_loop);
/*
* Load any server-side modules (plugins) available here.
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 ) {
+ serviceptr->msock = ig_tcp_server(
+ serviceptr->tcp_port, config.c_maxsessions);
+ if (serviceptr->msock >= 0) {
+ FD_SET(serviceptr->msock, &masterfds);
+ if (serviceptr->msock > masterhighest)
+ masterhighest = serviceptr->msock;
+ lprintf(7, "Bound to port %-5d (socket %d)\n",
+ serviceptr->tcp_port,
+ serviceptr->msock);
+ }
+ else {
+ lprintf(1, "Unable to bind to port %d\n",
+ serviceptr->tcp_port);
+ }
+ }
+
+
+ /*
+ * Now that we've bound the sockets, change to the BBS user id and its
+ * corresponding group ids
+ */
+ if (drop_root_perms) {
+ if ((pw = getpwuid(BBSUID)) == NULL)
+ lprintf(1, "WARNING: getpwuid(%d): %s\n"
+ "Group IDs will be incorrect.\n", BBSUID,
+ strerror(errno));
+ else {
+ initgroups(pw->pw_name, pw->pw_gid);
+ if (setgid(pw->pw_gid))
+ lprintf(3, "setgid(%d): %s\n", pw->pw_gid,
+ strerror(errno));
+ }
+ lprintf(7, "Changing uid to %d\n", BBSUID);
+ if (setuid(BBSUID) != 0) {
+ lprintf(3, "setuid() failed: %s\n", strerror(errno));
+ }
+ }
+
/*
* Now create a bunch of worker threads.
*/
void worker_thread(void) {
int i;
char junk;
- int numselect = 0;
int highest;
struct CitContext *ptr;
struct CitContext *bind_me = NULL;
fd_set readfds;
int retval;
struct CitContext *con= NULL; /* Temporary context pointer */
+ struct ServiceFunctionHook *serviceptr;
struct sockaddr_in fsin; /* Data for master socket */
int alen; /* Data for master socket */
int ssock; /* Descriptor for client socket */
*/
begin_critical_section(S_I_WANNA_SELECT);
-SETUP_FD: FD_ZERO(&readfds);
- FD_SET(msock, &readfds);
- highest = msock;
- FD_SET(rescan[0], &readfds);
- if (rescan[0] > highest) highest = rescan[0];
- numselect = 2;
-
+SETUP_FD: memcpy(&readfds, &masterfds, sizeof(fd_set) );
+ highest = masterhighest;
begin_critical_section(S_SESSION_TABLE);
for (ptr = ContextList; ptr != NULL; ptr = ptr->next) {
if (ptr->state == CON_IDLE) {
FD_SET(ptr->client_socket, &readfds);
if (ptr->client_socket > highest)
highest = ptr->client_socket;
- ++numselect;
}
}
end_critical_section(S_SESSION_TABLE);
/* Next, check to see if it's a new client connecting
* on the master socket.
*/
- else if (FD_ISSET(msock, &readfds)) {
- alen = sizeof fsin;
- ssock = accept(msock, (struct sockaddr *)&fsin, &alen);
- if (ssock < 0) {
- lprintf(2, "citserver: accept() failed: %s\n",
- strerror(errno));
- }
- else {
- lprintf(7, "citserver: New client socket %d\n",
- ssock);
-
- /* New context will be created already set up
- * in the CON_EXECUTING state.
- */
- con = CreateNewContext();
-
- /* Assign our new socket number to it. */
- con->client_socket = ssock;
+ else for (serviceptr = ServiceHookTable; serviceptr != NULL;
+ serviceptr = serviceptr->next ) {
+
+ if (FD_ISSET(serviceptr->msock, &readfds)) {
+ alen = sizeof fsin;
+ ssock = accept(serviceptr->msock,
+ (struct sockaddr *)&fsin, &alen);
+ if (ssock < 0) {
+ lprintf(2, "citserver: accept(): %s\n",
+ strerror(errno));
+ }
+ else {
+ lprintf(7, "citserver: "
+ "New client socket %d\n",
+ ssock);
+
+ /* New context will be created already
+ * set up in the CON_EXECUTING state.
+ */
+ con = CreateNewContext();
+
+ /* Assign new socket number to it. */
+ con->client_socket = ssock;
+ con->h_command_function =
+ serviceptr->h_command_function;
- /* Set the SO_REUSEADDR socket option */
- i = 1;
- setsockopt(ssock, SOL_SOCKET, SO_REUSEADDR,
- &i, sizeof(i));
-
- pthread_setspecific(MyConKey, (void *)con);
- begin_session(con);
- /* do_command_loop(); */
- pthread_setspecific(MyConKey, (void *)NULL);
- con->state = CON_IDLE;
- goto SETUP_FD;
+ /* Set the SO_REUSEADDR socket option */
+ i = 1;
+ setsockopt(ssock, SOL_SOCKET,
+ SO_REUSEADDR,
+ &i, sizeof(i));
+
+ pthread_setspecific(MyConKey,
+ (void *)con);
+ begin_session(con);
+ serviceptr->h_greeting_function();
+ pthread_setspecific(MyConKey,
+ (void *)NULL);
+ con->state = CON_IDLE;
+ goto SETUP_FD;
+ }
}
}
* thread that the &readfds needs to be refreshed with more
* current data.
*/
- else if (FD_ISSET(rescan[0], &readfds)) {
+ 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) {
pthread_setspecific(MyConKey, (void *)bind_me);
- do_command_loop();
+ CC->h_command_function();
pthread_setspecific(MyConKey, (void *)NULL);
bind_me->state = CON_IDLE;
if (bind_me->kill_me == 1) {
projects / citadel.git / blobdiff