* For copying and distribution information, please see the file
* <mit-copyright.h>.
*
- * SMS server process.
+ * MOIRA server process.
*
* Most of this is stolen from ../gdb/tsr.c
*
*
*/
-static char *rcsid_sms_main_c = "$Header$";
+static char *rcsid_mr_main_c = "$Header$";
#include <mit-copyright.h>
-#include <strings.h>
+#include <string.h>
+#include <stdio.h>
#include <sys/types.h>
#include <sys/errno.h>
#include <sys/signal.h>
#include <sys/wait.h>
#include <sys/stat.h>
-#include "sms_server.h"
+#include <unistd.h>
+#include <signal.h>
+#include "mr_server.h"
#include <krb_et.h>
+#include <gdss_et.h>
+#include <arpa/inet.h>
extern CONNECTION newconn, listencon;
extern int errno;
extern FILE *journal;
-extern char *malloc();
-extern int free();
-extern char *inet_ntoa();
-extern void sms_com_err();
-extern void do_client();
-
-extern int sigshut();
-void clist_append();
-void oplist_append();
-void reapchild(), godormant(), gowakeup();
-
extern time_t now;
+int do_listen(char *port);
+void do_reset_listen(void);
+void clist_append(client *cp);
+void oplist_append(LIST_OF_OPERATIONS *oplp, OPERATION op);
+void oplist_delete(LIST_OF_OPERATIONS oplp, OPERATION op);
+void mr_setup_signals(void);
+int new_connection(void);
+
/*
- * Main SMS server loop.
+ * Main MOIRA server loop.
*
* Initialize the world, then start accepting connections and
* making progress on current connections.
*/
/*ARGSUSED*/
-int
-main(argc, argv)
- int argc;
- char **argv;
+int main(argc, argv)
+ int argc;
+ char **argv;
{
- int status;
+ int status, i;
time_t tardy;
+ char *port;
+ extern char *database;
struct stat stbuf;
whoami = argv[0];
*/
initialize_sms_error_table();
initialize_krb_error_table();
- set_com_err_hook(sms_com_err);
- setlinebuf(stderr);
-
- if (argc != 1) {
- com_err(whoami, 0, "Usage: smsd");
+ initialize_gdss_error_table();
+ set_com_err_hook(mr_com_err);
+ setvbuf(stderr, NULL, _IOLBF, BUFSIZ);
+
+ port = strchr(MOIRA_SERVER, ':') + 1;
+
+ for (i = 1; i < argc; i++) {
+ if (!strcmp(argv[i], "-db") && i+1 < argc) {
+ database = argv[i+1];
+ i++;
+ } else if (!strcmp(argv[i], "-p") && i+1 < argc) {
+ port = argv[i+1];
+ i++;
+ } else {
+ com_err(whoami, 0, "Usage: moirad [-db database][-p port]");
exit(1);
- }
+ }
+ }
- /* Profiling implies that getting rid of one level of call
- * indirection here wins us maybe 1% on the VAX.
- */
- gdb_amv = malloc;
- gdb_fmv = free;
-
/*
* GDB initialization.
*/
* Database initialization. Only init if database should be open.
*/
- if (stat(SMS_MOTD_FILE, &stbuf) != 0) {
- if ((status = sms_open_database()) != 0) {
+ if (stat(MOIRA_MOTD_FILE, &stbuf) != 0) {
+ if ((status = mr_open_database()) != 0) {
com_err(whoami, status, " when trying to open database.");
exit(1);
}
nclients = 0;
clients = (client **) malloc(0);
- sms_setup_signals();
+ mr_setup_signals();
journal = fopen(JOURNAL, "a");
if (journal == NULL) {
/*
* Establish template connection.
*/
- if ((status = do_listen()) != 0) {
+ if ((status = do_listen(port)) != 0) {
com_err(whoami, status,
" while trying to create listening connection");
exit(1);
op_list = create_list_of_operations(1, listenop);
com_err(whoami, 0, "started (pid %d)", getpid());
- com_err(whoami, 0, rcsid_sms_main_c);
+ com_err(whoami, 0, rcsid_mr_main_c);
if (dormant != ASLEEP)
- send_zgram("SMS", "server started");
+ send_zgram("MOIRA", "server started");
else
- send_zgram("SMS", "server started, but database closed");
+ send_zgram("MOIRA", "server started, but database closed");
/*
* Run until shut down.
com_err(whoami, 0, "tick");
#endif notdef
if (dormant == SLEEPY) {
- sms_close_database();
+ mr_close_database();
com_err(whoami, 0, "database closed");
- sms_setup_signals();
- send_zgram("SMS", "database closed");
+ mr_setup_signals();
+ send_zgram("MOIRA", "database closed");
dormant = ASLEEP;
} else if (dormant == GROGGY) {
- sms_open_database();
+ mr_open_database();
com_err(whoami, 0, "database open");
- sms_setup_signals();
- send_zgram("SMS", "database open again");
+ mr_setup_signals();
+ send_zgram("MOIRA", "database open again");
dormant = AWAKE;
}
if (errno == EWOULDBLOCK) {
do_reset_listen();
} else {
+ static int count = 0;
com_err(whoami, errno,
- " error on listen");
- exit(1);
+ " error (%d) on listen", count);
+ if (count++ > 10)
+ exit(1);
}
} else if ((status = new_connection()) != 0) {
com_err(whoami, errno,
* down now.
*/
if ((dormant == AWAKE) && (nclients == 1) &&
- (stat(SMS_MOTD_FILE, &stbuf) == 0)) {
+ (stat(MOIRA_MOTD_FILE, &stbuf) == 0)) {
com_err(whoami, 0, "motd file exists, slumbertime");
dormant = SLEEPY;
}
* to be down, then wake up.
*/
if ((dormant == ASLEEP) &&
- (stat(SMS_MOTD_FILE, &stbuf) == -1) &&
+ (stat(MOIRA_MOTD_FILE, &stbuf) == -1) &&
(errno == ENOENT)) {
com_err(whoami, 0, "motd file no longer exists, waking up");
dormant = GROGGY;
do_client(cur_client);
} else if (clients[i]->last_time_used < tardy) {
com_err(whoami, 0, "Shutting down connection due to inactivity");
- shutdown(cur_client->con->in.fd, 0);
+ shutdown(cur_client->con->in.fd, 2);
}
cur_client = NULL;
if (takedown) break;
}
}
com_err(whoami, 0, "%s", takedown);
- sms_close_database();
- send_zgram("SMS", takedown);
+ mr_close_database();
+ send_zgram("MOIRA", takedown);
return 0;
}
* Set up the template connection and queue the first accept.
*/
-int
-do_listen()
+int do_listen(port)
+ char *port;
{
- char *service = index(SMS_SERVER, ':') + 1;
-
- listencon = create_listening_connection(service);
+ listencon = create_listening_connection(port);
if (listencon == NULL)
return errno;
}
-do_reset_listen()
+void do_reset_listen(void)
{
client_addrlen = sizeof(client_addr);
start_accepting_client(listencon, listenop, &newconn,
*
* It sets up a new client and adds it to the list of currently active clients.
*/
-int
-new_connection()
+int new_connection(void)
{
register client *cp;
static counter = 0;
}
if (newconn == NULL) {
- return SMS_NOT_CONNECTED;
+ return MR_NOT_CONNECTED;
}
/*
* Set up the new connection and reply to the client
*/
cp = (client *)malloc(sizeof *cp);
- bzero(cp, sizeof(*cp));
+ memset(cp, 0, sizeof(*cp));
cp->action = CL_ACCEPT;
cp->con = newconn;
cp->id = counter++;
cp->args = NULL;
cp->clname[0] = NULL;
- cp->reply.sms_argv = NULL;
+ cp->reply.mr_argv = NULL;
cp->first = NULL;
cp->last = NULL;
cp->last_time_used = now;
/*
* Add a new client to the known clients.
*/
-void
-clist_append(cp)
- client *cp;
+void clist_append(cp)
+ client *cp;
{
client **clients_n;
nclients++;
clients_n = (client **)malloc
((unsigned)(nclients * sizeof(client *)));
- bcopy((char *)clients, (char *)clients_n, (nclients-1)*sizeof(cp));
+ memcpy((char *)clients_n, (char *)clients, (nclients-1)*sizeof(cp));
clients_n[nclients-1] = cp;
free((char *)clients);
clients = clients_n;
}
-void
-clist_delete(cp)
- client *cp;
+void clist_delete(cp)
+ client *cp;
{
client **clients_n, **scpp, **dcpp; /* source and dest client */
/* ptr ptr */
* cases it won't have to copy the array.
*/
-void
-oplist_append(oplp, op)
- LIST_OF_OPERATIONS *oplp;
- OPERATION op;
+void oplist_append(oplp, op)
+ LIST_OF_OPERATIONS *oplp;
+ OPERATION op;
{
int count = (*oplp)->count+1;
LIST_OF_OPERATIONS newlist = (LIST_OF_OPERATIONS)
db_alloc(size_of_list_of_operations(count));
- bcopy((char *)(*oplp), (char *)newlist,
+ memcpy((char *)newlist, (char *)(*oplp),
size_of_list_of_operations((*oplp)->count));
newlist->count++;
newlist->op[count-1] = op;
}
-oplist_delete(oplp, op)
- LIST_OF_OPERATIONS oplp;
- register OPERATION op;
+void oplist_delete(oplp, op)
+ LIST_OF_OPERATIONS oplp;
+ OPERATION op;
{
register OPERATION *s;
register int c;
}
-void reapchild()
+void reapchild(x)
+ int x;
{
- union wait status;
- int pid;
+ int status, pid;
- while ((pid = wait3(&status, WNOHANG, (struct rusage *)0)) > 0) {
+ while ((pid = waitpid(-1, &status, WNOHANG)) > 0) {
+#ifdef INCR_DEBUG
+ com_err(whoami, 0, "Reaping %d (inc_pid=%d, inc_running=%d)",
+ pid, inc_pid, inc_running);
+#endif
if (pid == inc_pid)
inc_running = 0;
- if (!takedown && (status.w_termsig != 0 || status.w_retcode != 0))
- com_err(whoami, 0, "%d: child exits with signal %d status %d",
- pid, status.w_termsig, status.w_retcode);
+ if (!takedown && (WTERMSIG(status)!= 0 || WEXITSTATUS(status)!= 0))
+ com_err(whoami, 0, "%d: child exits with signal %d status %d",
+ pid, WTERMSIG(status), WEXITSTATUS(status));
}
}
-void godormant()
+void godormant(x)
+ int x;
{
switch (dormant) {
case AWAKE:
}
-void gowakeup()
+void gowakeup(x)
+ int x;
{
switch (dormant) {
case ASLEEP:
}
-sms_setup_signals()
+void mr_setup_signals(void)
{
+ struct sigaction action;
+
+ action.sa_flags = 0;
+ sigemptyset(&action.sa_mask);
+
/* There should probably be a few more of these. */
- if ((((int)signal (SIGTERM, sigshut)) < 0) ||
- (((int)signal (SIGCHLD, reapchild)) < 0) ||
- (((int)signal (SIGUSR1, godormant)) < 0) ||
- (((int)signal (SIGUSR2, gowakeup)) < 0) ||
- (((int)signal (SIGHUP, sigshut)) < 0)) {
- com_err(whoami, errno, " Unable to establish signal handlers.");
- exit(1);
+ action.sa_handler = sigshut;
+ if ((sigaction(SIGTERM, &action, NULL) < 0) ||
+ (sigaction(SIGINT, &action, NULL) < 0) ||
+ (sigaction(SIGHUP, &action, NULL) < 0)) {
+ com_err(whoami, errno, "Unable to establish signal handlers.");
+ exit(1);
+ }
+
+ action.sa_handler = godormant;
+ if (sigaction(SIGUSR1, &action, NULL) < 0) {
+ com_err(whoami, errno, "Unable to establish signal handlers.");
+ exit(1);
+ }
+
+ action.sa_handler = gowakeup;
+ if (sigaction(SIGUSR2, &action, NULL) < 0) {
+ com_err(whoami, errno, "Unable to establish signal handlers.");
+ exit(1);
+ }
+
+ action.sa_handler = reapchild;
+ sigaddset(&action.sa_mask, SIGCHLD);
+ if (sigaction(SIGCHLD, &action, NULL) < 0) {
+ com_err(whoami, errno, "Unable to establish signal handlers.");
+ exit(1);
}
}
andersk / moira.git / blobdiff