X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=kernel%2Fmain.c;h=7926912f99a650645f45eaf21359a3303928f2e0;hb=68ab7e062ced1b3d335ab6432840a393b6627a27;hp=977dfee101614ca6e4cfc3867403fd15dedd89f8;hpb=4fc919060b269ed951045e3dd6fce2721f17b930;p=egate.git diff --git a/kernel/main.c b/kernel/main.c index 977dfee..7926912 100644 --- a/kernel/main.c +++ b/kernel/main.c @@ -1,8 +1,33 @@ -/* Gateway kernel +/* Gateway kernel - Main * Europagate, 1995 * * $Log: main.c,v $ - * Revision 1.10 1995/03/01 14:32:25 adam + * Revision 1.18 1995/04/19 13:19:09 adam + * New command: account - for authentication. + * + * Revision 1.17 1995/04/19 10:46:18 adam + * Persistency works much better now. New command: status - history-like + * + * Revision 1.16 1995/04/19 07:31:07 adam + * First work on Z39.50 persistence. + * + * Revision 1.15 1995/04/17 09:34:30 adam + * Timeout (idletime) adjustable. Minor changes in kernel. + * + * Revision 1.14 1995/03/28 11:42:34 adam + * First use of string-queue utility. + * + * Revision 1.13 1995/03/28 08:01:25 adam + * FIFO existence is used to test for a running kernel. + * + * Revision 1.12 1995/03/27 12:51:05 adam + * New log level in use: GW_LOG_ERRNO. + * + * Revision 1.11 1995/03/27 08:24:02 adam + * First use of gip interface and gw-db. + * First work on eti program. + * + * Revision 1.10 1995/03/01 14:32:25 adam * Better diagnostics. Default is, that only one database selected when * several are known. * @@ -44,19 +69,116 @@ #include #include #include +#include +#include +#include +#include +#include +#include #include "kernel.h" FILE *reply_fd = stdout; struct gw_kernel_info info; +static void kernel_events (struct str_queue *queue, int userid) +{ + char fifo_client_name[1024]; + char fifo_server_name[1024]; + char line_buf[1024]; + GIP gip; + fd_set set_r; + int r, gip_fd; + struct timeval tv; + int timeout; + int continuation = 0; + + timeout = atoi(gw_res_get (info.kernel_res, "gw.timeout", "600")); + gw_log (GW_LOG_DEBUG, KERNEL_LOG, "kernel event loop"); + + sprintf (fifo_client_name, "fifo.c.%d", userid); + sprintf (fifo_server_name, "fifo.s.%d", userid); + + gip = gips_initialize (fifo_server_name); + gips_open (gip, fifo_client_name); + gip_fd = gip_infileno (gip); + + while (1) + { + FD_ZERO (&set_r); + FD_SET (gip_fd, &set_r); + tv.tv_sec = timeout; + tv.tv_usec = 0; + + gw_log (GW_LOG_DEBUG, KERNEL_LOG, "IPC select"); + r = select (gip_fd+1, &set_r, NULL, NULL, &tv); + if (r == -1) + { + gw_log (GW_LOG_FATAL|GW_LOG_ERRNO, KERNEL_LOG, "select"); + exit (1); + } + if (r == 0) + { + gw_log (GW_LOG_STAT, KERNEL_LOG, "Timeout after %d seconds", + timeout); + if (info.zass) + save_p_state (userid); + break; + } + if (FD_ISSET (gip_fd, &set_r)) + { + char command[128], *cp; + + if (!(lgets (command, 127, gip_fd))) + { + gw_log (GW_LOG_WARN, KERNEL_LOG, "Unexpected close"); + break; + } + if ((cp = strchr (command, '\n'))) + *cp = '\0'; + gw_log (GW_LOG_STAT, KERNEL_LOG, "IPC: %s", command); + if (!strcmp (command, "mail")) + { + gw_log (GW_LOG_DEBUG, KERNEL_LOG, "Incoming mail...\n"); + while (lgets (line_buf, sizeof(line_buf)-1, gip_fd)) + str_queue_enq (queue, line_buf); + urp_start (continuation, queue); + if (!continuation) + load_p_state (userid); + urp_command (queue); + urp_end (); + while (str_queue_deq (queue, 0, 0)) + ; + } + else if (!strcmp (command, "stop")) + { + gw_log (GW_LOG_DEBUG, KERNEL_LOG, "stop"); + break; + } + else + { + gw_log (GW_LOG_WARN, KERNEL_LOG, "Unknown IPC: %s", command); + } + continuation = 1; + } + } + gips_close (gip); + gips_destroy (gip); + unlink (fifo_client_name); + unlink (fifo_server_name); +} + int main (int argc, char **argv) { + int userid = -1; + struct str_queue *queue; + info.kernel_res = NULL; info.default_res = "default.res"; info.override_res = NULL; *info.target = 0; + *info.account = 0; info.lang = NULL; info.bibset = NULL; info.zass = NULL; @@ -64,6 +186,7 @@ int main (int argc, char **argv) info.override_hostname = NULL; info.databases = NULL; info.database = NULL; + info.setno = -1; #if USE_FML info.fml = NULL; #endif @@ -77,7 +200,24 @@ int main (int argc, char **argv) { switch (argv[0][1]) { + case 'H': + fprintf (stderr, "kernel [option..] [resource]\n"); + fprintf (stderr, "If no resource file is given"); + fprintf (stderr, " default.res is used\n"); + fprintf (stderr, "Options:\n"); + fprintf (stderr, " -d Enable debugging log\n"); + fprintf (stderr, " -t target Open target immediately\n"); + fprintf (stderr, " -g lang Set language\n"); + fprintf (stderr, " -o resource Override with resource\n"); + fprintf (stderr, " -h host Override host\n"); + fprintf (stderr, " -p port Override port\n"); + fprintf (stderr, " -l log Set Log file\n"); + fprintf (stderr, " -i id Set IPC userid\n"); + exit (1); case 'd': + gw_log_level (GW_LOG_ALL & ~RES_DEBUG); + break; + case 'D': gw_log_level (GW_LOG_ALL); break; case 't': @@ -94,7 +234,7 @@ int main (int argc, char **argv) exit (1); } break; - case 'l': + case 'g': if (argv[0][2]) info.lang = argv[0]+2; else if (argc > 0) @@ -118,7 +258,7 @@ int main (int argc, char **argv) } else { - gw_log (GW_LOG_FATAL, KERNEL_LOG, "missing language name"); + gw_log (GW_LOG_FATAL, KERNEL_LOG, "missing override name"); exit (1); } break; @@ -150,7 +290,7 @@ int main (int argc, char **argv) exit (1); } break; - case 'g': + case 'l': if (argv[0][2]) gw_log_file (GW_LOG_ALL, argv[0]+2); else if (argc > 0) @@ -164,6 +304,20 @@ int main (int argc, char **argv) exit (1); } break; + case 'i': + if (argv[0][2]) + userid = atoi (argv[0]+2); + else if (argc > 0) + { + --argc; + userid = atoi (*++argv); + } + else + { + gw_log (GW_LOG_FATAL, KERNEL_LOG, "missing user id"); + exit (1); + } + break; default: gw_log (GW_LOG_FATAL, KERNEL_LOG, "unknown option %s", *argv); exit (1); @@ -172,12 +326,34 @@ int main (int argc, char **argv) else info.default_res = *argv; } - read_kernel_res (); - urp (stdin); + if (!(queue = str_queue_mk ())) + { + gw_log (GW_LOG_FATAL|GW_LOG_ERRNO, KERNEL_LOG, "str_queue_mk"); + exit (1); + } + if (userid != -1) + { + read_kernel_res (); + kernel_events (queue, userid); + } + else + { + char line_buf[512]; + read_kernel_res (); + while (lgets (line_buf, sizeof(line_buf)-1, 0)) + str_queue_enq (queue, line_buf); + urp_start (0, queue); + urp_command (queue); + urp_end (); + } return 0; } -struct gw_user_set *user_set_add (const char *name, int hits) +struct gw_user_set *user_set_add (const char *name, int hits, + const char *database, + struct ccl_rpn_node *rpn, + int present_flag, + const char *search_str) { struct gw_user_set *s; @@ -186,6 +362,10 @@ struct gw_user_set *user_set_add (const char *name, int hits) s->name = gw_strdup (name); s->hits = hits; + s->database = gw_strdup (database); + s->rpn = rpn; + s->present_flag = present_flag; + s->search_str = gw_strdup (search_str); s->prev = info.sets; info.sets = s; return s; @@ -198,6 +378,8 @@ void user_set_init (void) for (s = info.sets; s; s = s1) { free (s->name); + free (s->database); + ccl_rpn_delete (s->rpn); s1 = s->prev; free (s); } @@ -309,16 +491,20 @@ void read_kernel_res (void) if (*info.target && ! gw_res_get (info.kernel_res, resource_name, NULL)) { /* target is there, and there is no sub-resource for it... */ - char *split; + const char *split; if ((split = strchr (info.target, ':'))) - *split++ = '\0'; - strncpy (info.hostname, info.target, sizeof(info.hostname)-1); - if (split) - info.port = atoi (split); + { + memcpy (info.hostname, info.target, split-info.target); + info.hostname[split-info.target] = '\0'; + info.port = atoi (split+1); + } else + { + strcpy (info.hostname, info.target); info.port = atoi (gw_res_get (info.kernel_res, "gw.portno", "210")); + } } else { @@ -359,6 +545,8 @@ void read_kernel_res (void) if (info.override_hostname) strncpy (info.hostname, info.override_hostname, sizeof(info.hostname)-1); + v = gw_res_get (info.kernel_res, "gw.result.set", NULL); + info.setno = v ? -1 : 0; #if USE_FML if (!info.fml) {