projects
/
yaz-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
*** empty log message ***
[yaz-moved-to-github.git]
/
server
/
statserv.c
diff --git
a/server/statserv.c
b/server/statserv.c
index
a616cc9
..
5adb116
100644
(file)
--- a/
server/statserv.c
+++ b/
server/statserv.c
@@
-4,7
+4,16
@@
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: statserv.c,v $
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: statserv.c,v $
- * Revision 1.9 1995-03-27 08:34:30 quinn
+ * Revision 1.12 1995-03-30 13:29:02 quinn
+ * Smallish
+ *
+ * Revision 1.11 1995/03/30 12:18:17 quinn
+ * Fixed bug.
+ *
+ * Revision 1.10 1995/03/29 15:40:16 quinn
+ * Ongoing work. Statserv is now dynamic by default
+ *
+ * Revision 1.9 1995/03/27 08:34:30 quinn
* Added dynamic server functionality.
* Released bindings to session.c (is now redundant)
*
* Added dynamic server functionality.
* Released bindings to session.c (is now redundant)
*
@@
-55,9
+64,10
@@
#include <tcpip.h>
#include <xmosi.h>
#include <dmalloc.h>
#include <tcpip.h>
#include <xmosi.h>
#include <dmalloc.h>
+#include <log.h>
static char *me = "";
static char *me = "";
-static int dynamic = 0; /* fork on incoming connection */
+static int dynamic = 1; /* fork on incoming connection */
#define DEFAULT_LISTENER "tcp:localhost:9999"
#define DEFAULT_LISTENER "tcp:localhost:9999"
@@
-189,7
+199,8
@@
static void add_listener(char *where, int what)
void *ap;
IOCHAN lst;
void *ap;
IOCHAN lst;
- fprintf(stderr, "Adding %s listener on %s\n",
+ fprintf(stderr, "Adding %s %s listener on %s\n",
+ dynamic ? "dynamic" : "static",
what == PROTO_SR ? "SR" : "Z3950", where);
if (!where || sscanf(where, "%[^:]:%s", mode, addr) != 2)
{
what == PROTO_SR ? "SR" : "Z3950", where);
if (!where || sscanf(where, "%[^:]:%s", mode, addr) != 2)
{
@@
-206,6
+217,7
@@
static void add_listener(char *where, int what)
}
type = tcpip_type;
}
}
type = tcpip_type;
}
+#ifdef USE_XTIMOSI
else if (!strcmp(mode, "osi"))
{
if (!(ap = mosi_strtoaddr(addr)))
else if (!strcmp(mode, "osi"))
{
if (!(ap = mosi_strtoaddr(addr)))
@@
-215,6
+227,7
@@
static void add_listener(char *where, int what)
}
type = mosi_type;
}
}
type = mosi_type;
}
+#endif
else
{
fprintf(stderr, "You must specify either 'osi:' or 'tcp:'.\n");
else
{
fprintf(stderr, "You must specify either 'osi:' or 'tcp:'.\n");
@@
-250,10
+263,12
@@
int statserv_main(int argc, char **argv)
{
int ret, listeners = 0;
char *arg;
{
int ret, listeners = 0;
char *arg;
- int protocol = CS_Z3950;;
+ int protocol = CS_Z3950;
+ char *logfile = 0;
+ int loglevel = LOG_DEFAULT_LEVEL;
me = argv[0];
me = argv[0];
- while ((ret = options("szdl:", argv, argc, &arg)) != -2)
+ while ((ret = options("szSl:v:", argv, argc, &arg)) != -2)
switch (ret)
{
case 0:
switch (ret)
{
case 0:
@@
-262,9
+277,17
@@
int statserv_main(int argc, char **argv)
break;
case 'z': protocol = CS_Z3950; break;
case 's': protocol = CS_SR; break;
break;
case 'z': protocol = CS_Z3950; break;
case 's': protocol = CS_SR; break;
- case 'd': dynamic = 1; break;
+ case 'S': dynamic = 0; break;
+ case 'l':
+ logfile = arg;
+ log_init(loglevel, me, logfile);
+ break;
+ case 'v':
+ loglevel = log_mask_str(arg);
+ log_init(loglevel, me, logfile);
+ break;
default:
default:
- fprintf(stderr, "Usage: %s [ -zsd <listener-addr> ... ]\n", me);
+ fprintf(stderr, "Usage: %s [ -v <loglevel> -l <logfile> -zsS <listener-addr> ... ]\n", me);
exit(1);
}
if (dynamic)
exit(1);
}
if (dynamic)