* Europagate, 1995
*
* $Log: main.c,v $
- * Revision 1.26 1995/05/18 12:03:08 adam
+ * Revision 1.30 1996/02/12 10:04:54 adam
+ * The gateway doesn't try to reconnect if it is already known that
+ * it will fail (connect_fail flag introduced).
+ *
+ * Revision 1.29 1995/07/28 10:51:08 adam
+ * Bug fix: account from previous session had effect when new target command
+ * was executed.
+ *
+ * Revision 1.28 1995/07/03 08:20:15 adam
+ * More help information and better diagnostics.
+ *
+ * Revision 1.27 1995/05/19 13:25:59 adam
+ * Bug fixes. Better command line options.
+ *
+ * Revision 1.26 1995/05/18 12:03:08 adam
* Bug fixes and minor improvements.
*
* Revision 1.25 1995/05/16 09:40:42 adam
int continuation = 0;
int extra_fd;
int persist_flag;
+ int stop_flag = 0;
persist_flag = gw_res_bool (info.kernel_res, "gw.persist", 0);
timeout = gw_res_int (info.kernel_res, "gw.timeout", 600);
sprintf (fifo_server_name, "fifo.s.%d", info.userid);
gip = gips_initialize (fifo_server_name);
- gips_open (gip, fifo_client_name);
+ gips_open (gip, fifo_client_name, 1);
gip_fd = gip_infileno (gip);
extra_fd = open (fifo_server_name, O_WRONLY);
{
FD_ZERO (&set_r);
FD_SET (gip_fd, &set_r);
- tv.tv_sec = timeout;
+ if (stop_flag)
+ tv.tv_sec = 1;
+ else
+ tv.tv_sec = timeout;
tv.tv_usec = 0;
gw_log (GW_LOG_DEBUG, KERNEL_LOG, "IPC select");
}
if (r == 0)
{
- gw_log (GW_LOG_STAT, KERNEL_LOG, "Timeout after %d seconds",
- timeout);
+ if (stop_flag)
+ gw_log (GW_LOG_STAT, KERNEL_LOG, "Stopping");
+ else
+ gw_log (GW_LOG_STAT, KERNEL_LOG, "Timeout after %d seconds",
+ timeout);
if (info.zass && persist_flag)
save_p_state (info.userid);
break;
else if (!strcmp (command, "stop"))
{
gw_log (GW_LOG_DEBUG, KERNEL_LOG, "stop");
- break;
+ while (lgets (line_buf, sizeof(line_buf)-1, gip_fd))
+ ;
+ break;
}
else
- {
gw_log (GW_LOG_WARN, KERNEL_LOG, "Unknown IPC: %s", command);
- }
continuation = 1;
}
}
close (extra_fd);
gips_close (gip);
gips_destroy (gip);
-
- unlink (fifo_client_name);
- unlink (fifo_server_name);
}
int main (int argc, char **argv)
info.override_res = NULL;
*info.target = 0;
*info.account = 0;
+ info.account_in_session = 1;
info.lang = NULL;
info.bibset = NULL;
info.zass = NULL;
info.database = NULL;
info.setno = -1;
info.userid = -1;
+ info.connect_failed = 0;
#if USE_FML
info.fml = NULL;
#endif
switch (argv[0][1])
{
case 'H':
- fprintf (stderr, "kernel [option..] [resource]\n");
- fprintf (stderr, "If no resource file is given");
+ fprintf (stderr, "kernel [options] [resourceFile]\n");
+ fprintf (stderr, "If no resource file is specified");
fprintf (stderr, " default.res is used\n");
fprintf (stderr, "Options:\n");
fprintf (stderr, " -d Enable debugging log\n");
gw_log_session (info.userid);
break;
default:
- gw_log (GW_LOG_FATAL, KERNEL_LOG, "unknown option %s", *argv);
+ gw_log (GW_LOG_FATAL, KERNEL_LOG, "unknown option %s;"
+ " use -H for help", *argv);
exit (1);
}
}
void read_kernel_res (void)
{
- char path_prefix[128];
- char fname[160];
const char *v;
char *cp;
char resource_name[256];
info.default_res);
return;
}
- strcpy (path_prefix, gw_res_get (info.kernel_res, "gw.path", "."));
-
/* fetch target definitions (if defined at all) */
if (*info.target)
{
sprintf (resource_name, "gw.target.%s", info.target);
v = gw_res_get (info.kernel_res, resource_name, NULL);
if (v)
- {
- sprintf (fname, "%s/%s", path_prefix, v);
- gw_res_merge (info.kernel_res, fname);
- }
+ gw_res_merge (info.kernel_res, v);
}
/* fetch user definitions (if user-id is specified) */
if (info.userid >= 0)
{
- sprintf (fname, "%s/user.%d.r", path_prefix, info.userid);
+ char fname[250];
+ sprintf (fname, "user.%d.r", info.userid);
gw_res_merge (info.kernel_res, fname);
}
/* fetch language definitions (if specified at all) */
v = gw_res_get (info.kernel_res, resource_name, NULL);
if (v)
{
- sprintf (fname, "%s/%s", path_prefix, v);
gw_log (GW_LOG_DEBUG, KERNEL_LOG, "Reading language resources %s",
- fname);
- gw_res_merge (info.kernel_res, fname);
+ v);
+ gw_res_merge (info.kernel_res, v);
}
}
/* fetch overriding resources from file (if specified) */
if (info.override_res)
- {
- sprintf (fname, "%s/%s", path_prefix, info.override_res);
- gw_res_merge (info.kernel_res, fname);
- }
+ gw_res_merge (info.kernel_res, info.override_res);
/* read bibset definition for ccl */
v = gw_res_get (info.kernel_res, "gw.bibset", NULL);
{
FILE *bib_inf;
- sprintf (fname, "%s/%s", path_prefix, v);
- bib_inf = fopen (fname, "r");
+ bib_inf = fopen (v, "r");
if (!bib_inf)
- gw_log (GW_LOG_WARN, KERNEL_LOG, "cannot open %s", fname);
+ gw_log (GW_LOG_WARN, KERNEL_LOG, "cannot open %s", v);
else
{
- gw_log (GW_LOG_DEBUG, KERNEL_LOG, "reading bib file %s", fname);
+ gw_log (GW_LOG_DEBUG, KERNEL_LOG, "reading bib file %s", v);
ccl_qual_file (info.bibset, bib_inf);
fclose (bib_inf);
}
sizeof(info.hostname)-1);
info.port = gw_res_int (info.kernel_res, "gw.portno", 210);
strcpy (info.account, gw_res_get (info.kernel_res, "gw.account", ""));
+ info.account_in_session = 0;
}
/* set info.databases (all available databases for target) */
/* set info.database (first database for target) */
if (!info.fml)
{
v = gw_res_get (info.kernel_res, "gw.fml", "default.fml");
- sprintf (fname, "%s/%s", path_prefix, v);
- fml_inf = fopen (fname, "r");
+ fml_inf = fopen (v, "r");
if (!fml_inf)
- gw_log (GW_LOG_WARN, KERNEL_LOG,
- "cannot open fml script %s", fname);
+ gw_log (GW_LOG_WARN, KERNEL_LOG, "cannot open fml script %s", v);
else
{
info.fml = fml_open ();
projects / egate.git / blobdiff