* Let the reader beware.
*
* $Log$
- * Revision 1.6 1987-06-03 17:41:00 wesommer
- * Added startup support.
+ * Revision 1.13 1987-08-04 02:40:30 wesommer
+ * Do end run around minor hotspot.
*
+ * Revision 1.12 87/08/04 01:50:00 wesommer
+ * Rearranged messages.
+ *
+ * Revision 1.11 87/07/29 16:04:54 wesommer
+ * Add keepalive feature.
+ *
+ * Revision 1.10 87/06/30 20:02:26 wesommer
+ * Added returned tuple chain to client structure.
+ * Added local realm global variable.
+ *
+ * Revision 1.9 87/06/21 16:39:54 wesommer
+ * Performance work, rearrangement of include files.
+ *
+ * Revision 1.8 87/06/09 18:44:45 wesommer
+ * modified error handling.
+ *
+ * Revision 1.7 87/06/08 02:44:44 wesommer
+ * Minor lint fix.
+ *
+ * Revision 1.6 87/06/03 17:41:00 wesommer
+ * Added startup support.
+ *
* Revision 1.5 87/06/03 16:07:17 wesommer
* Fixes for lint.
*
#include <strings.h>
#include <sys/errno.h>
#include <sys/signal.h>
-#include "sms_private.h"
#include "sms_server.h"
extern CONNECTION newconn, listencon;
extern char *malloc();
+extern int free();
extern char *inet_ntoa();
extern void sms_com_err();
extern void do_client();
void oplist_append();
extern u_short ntohs();
+extern time_t now;
+
/*
* Main SMS server loop.
*
char **argv;
{
int status;
+ time_t tardy;
whoami = argv[0];
/*
init_sms_err_tbl();
init_krb_err_tbl();
set_com_err_hook(sms_com_err);
-
+ setlinebuf(stderr);
+
if (argc != 1) {
com_err(whoami, 0, "Usage: smsd");
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.
com_err(whoami, 0, "GDB initialization failed.");
exit(1);
}
-
+ gdb_debug(0); /* this can be patched, if necessary, to enable */
+ /* GDB level debugging .. */
+ krb_realm = malloc(REALM_SZ);
+ get_krbrlm(krb_realm, 1);
+
/*
* Database initialization.
*/
op_list = create_list_of_operations(1, listenop);
- (void) sprintf(buf1, "started (pid %d)", getpid());
- com_err(whoami, 0, buf1);
+ com_err(whoami, 0, "started (pid %d)", getpid());
com_err(whoami, 0, rcsid_sms_main_c);
/*
continue;
}
if (takedown) break;
+ time(&now);
#ifdef notdef
fprintf(stderr, " tick\n");
#endif notdef
/*
- * Handle any existing connections.
- */
- for (i=0; i<nclients; i++) {
- if (OP_DONE(clients[i]->pending_op)) {
- cur_client = clients[i];
- do_client(cur_client);
- cur_client = NULL;
- if (takedown) break;
- }
- }
- /*
- * Handle any new connections.
+ * Handle any new connections; this comes first so
+ * errno isn't tromped on.
*/
if (OP_DONE(listenop)) {
- if ((status = new_connection()) != 0) {
+ if (OP_STATUS(listenop) == OP_CANCELLED) {
+ if (errno == EWOULDBLOCK) {
+ do_reset_listen();
+ } else {
+ com_err(whoami, errno,
+ "error on listen");
+ exit(1);
+ }
+ } else if ((status = new_connection()) != 0) {
com_err(whoami, errno,
"Error on listening operation.");
/*
*/
}
}
+ /*
+ * Handle any existing connections.
+ */
+ tardy = now - 30*60;
+
+ for (i=0; i<nclients; i++) {
+ cur_client = clients[i];
+ if (OP_DONE(clients[i]->pending_op)) {
+ cur_client->last_time_used = now;
+ 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);
+ }
+ cur_client = NULL;
+ if (takedown) break;
+ }
}
- com_err(whoami, 0, takedown);
+ com_err(whoami, 0, "%s", takedown);
sms_close_database();
return 0;
}
return 0;
}
+
+do_reset_listen()
+{
+ client_addrlen = sizeof(client_addr);
+ start_accepting_client(listencon, listenop, &newconn,
+ (char *)&client_addr,
+ &client_addrlen, &client_tuple);
+}
+
/*
* This routine is called when a new connection comes in.
*
int
new_connection()
{
- register client *cp = (client *)malloc(sizeof *cp);
+ register client *cp;
static counter = 0;
/*
* Make sure there's been no error
*/
- if(OP_STATUS(listenop) != OP_COMPLETE ||
- newconn == NULL) {
+ if(OP_STATUS(listenop) != OP_COMPLETE) {
return errno;
-#ifdef notdef
- exit(8); /* XXX */
-#endif notdef
+ }
+
+ if (newconn == NULL) {
+ return SMS_NOT_CONNECTED;
}
/*
* Set up the new connection and reply to the client
*/
-
+ cp = (client *)malloc(sizeof *cp);
cp->state = CL_STARTING;
cp->action = CL_ACCEPT;
cp->con = newconn;
cp->args = NULL;
cp->clname = NULL;
cp->reply.sms_argv = NULL;
-
+ cp->first = NULL;
+ cp->last = NULL;
+ cp->last_time_used = now;
newconn = NULL;
cp->pending_op = create_operation();
* Log new connection.
*/
- (void) sprintf(buf1,
- "New connection from %s port %d (now %d client%s)",
- inet_ntoa(cp->haddr.sin_addr),
- (int)ntohs(cp->haddr.sin_port),
- nclients,
- nclients!=1?"s":"");
- com_err(whoami, 0, buf1);
+ com_err(whoami, 0, "New connection from %s port %d (now %d client%s)",
+ inet_ntoa(cp->haddr.sin_addr),
+ (int)ntohs(cp->haddr.sin_port),
+ nclients,
+ nclients!=1?"s":"");
/*
* Get ready to accept the next connection.
free((char *)clients);
clients = clients_n;
clients_n = NULL;
-
+ oplist_delete(op_list, cp->pending_op);
reset_operation(cp->pending_op);
delete_operation(cp->pending_op);
+ sever_connection(cp->con);
free((char *)cp);
}
size_of_list_of_operations((*oplp)->count));
newlist->count++;
newlist->op[count-1] = op;
- db_free((*oplp), size_of_list_of_operations(count-1));
+ db_free((char *)(*oplp), size_of_list_of_operations(count-1));
(*oplp) = newlist;
}
+
+oplist_delete(oplp, op)
+ LIST_OF_OPERATIONS oplp;
+ register OPERATION op;
+{
+ register OPERATION *s;
+ register int c;
+
+ for (s = oplp->op, c=oplp->count; c; --c, ++s) {
+ if (*s == op) {
+ while (c > 0) {
+ *s = *(s+1);
+ ++s;
+ --c;
+ }
+ oplp->count--;
+ return;
+ }
+ }
+ abort();
+}
andersk / moira.git / blobdiff