X-Git-Url: https://git.distorted.org.uk/~mdw/fwd/blobdiff_plain/2d9ec601eef3d9db279702346db927958e7f83a9..17be1d6b52cc22403bcfec5e8547bf612d214690:/fw.c

diff --git a/fw.c b/fw.c
index 513cb23..4db1fdb 100644
--- a/fw.c
+++ b/fw.c
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: fw.c,v 1.4 1999/10/10 16:46:12 mdw Exp $
+ * $Id: fw.c,v 1.6 1999/12/22 15:44:10 mdw Exp $
  *
  * Port forwarding thingy
  *
@@ -29,6 +29,12 @@
 /*----- Revision history --------------------------------------------------* 
  *
  * $Log: fw.c,v $
+ * Revision 1.6  1999/12/22 15:44:10  mdw
+ * Make syslog a separate option, and do it better.
+ *
+ * Revision 1.5  1999/10/22 22:47:50  mdw
+ * Grammar changes.  Also, don't enable SIGINT if it's currently ignored.
+ *
  * Revision 1.4  1999/10/10 16:46:12  mdw
  * New resolver to initialize.  Also, include options for grammar and
  * options references.
@@ -117,8 +123,7 @@ void fw_log(time_t t, const char *fmt, ...)
     t = time(0);
   tm = localtime(&t);
   DENSURE(&d, 64);
-  d.len += strftime(d.buf, d.sz, "%Y-%m-%d %H:%M:%S", tm);
-  DPUTC(&d, ' ');
+  d.len += strftime(d.buf, d.sz, "%Y-%m-%d %H:%M:%S ", tm);
   va_start(ap, fmt);
   dstr_vputf(&d, fmt, ap);
   va_end(ap);
@@ -190,7 +195,7 @@ static void version(FILE *fp)
 
 static void usage(FILE *fp)
 {
-  pquis(fp, "Usage: $ [-db] [-f file] [config statements...]\n");
+  pquis(fp, "Usage: $ [-dql] [-f file] [config statements...]\n");
 }
 
 static void help(FILE *fp)
@@ -203,15 +208,17 @@ An excessively full-featured port-forwarder, which subsumes large chunks\n\
 of the functionality of inetd, netcat, and normal cat.  Options available\n\
 are:\n\
 \n\
--h, --help		Display this help message.\n\
--v, --version		Display the program's version number.\n\
--u, --usage		Display a terse usage summary.\n\
+-h, --help	  Display this help message.\n\
+-v, --version	  Display the program's version number.\n\
+-u, --usage	  Display a terse usage summary.\n\
 \n\
--g, --grammar		Show a summary of the configuration language.\n\
--o, --options		Show a summary of the source and target options.\n\
+-g, --grammar	  Show a summary of the configuration language.\n\
+-o, --options	  Show a summary of the source and target options.\n\
 \n\
--f, --file=FILE		Read configuration from a file.\n\
--d, --daemon		Fork into background after initializing.\n\
+-f, --file=FILE	  Read configuration from a file.\n\
+-q, --quiet	  Don't emit any logging information.\n\
+-d, --daemon	  Fork into background after initializing.\n\
+-l, --syslog	  Send log output to the system logger.\n\
 \n\
 Configuration may be supplied in one or more configuration files, or on\n\
 the command line (or both).  If no `-f' option is present, and no\n\
@@ -314,7 +321,7 @@ Exec options\n\
 	exec.env.[set] var [=] value\n\
 \n\
 Socket options\n\
-	socket.conn [=] number\n\
+	socket.conn [=] number|unlimited|one-shot\n\
 	socket.logging [=] yes|no\n\
 	socket.inet.[allow|deny] [from] address [/ address]\n\
 	socket.unix.fattr.*\n\
@@ -341,6 +348,7 @@ int main(int argc, char *argv[])
   enum {
     f_bogus = 1,
     f_file = 2,
+    f_syslog = 4,
     f_fork = 8
   };
 
@@ -357,10 +365,20 @@ int main(int argc, char *argv[])
   fattr_init(&fattr_global);
   scan_create(&sc);
 
-  /* --- Set up some signal handlers --- */
+  /* --- Set up some signal handlers --- *
+   *
+   * Don't enable @SIGINT@ if the caller already disabled it.
+   */
+
+  {
+    struct sigaction sa;
+
+    sig_add(&s_term, SIGTERM, fw_tidy, 0);
+    sigaction(SIGINT, 0, &sa);
+    if (sa.sa_handler != SIG_IGN)
+      sig_add(&s_int, SIGINT, fw_tidy, 0);
+  }
 
-  sig_add(&s_term, SIGTERM, fw_tidy, 0);
-  sig_add(&s_int, SIGINT, fw_tidy, 0);
   atexit(fw_exit);
 
   /* --- Parse command line options --- */
@@ -384,13 +402,15 @@ int main(int argc, char *argv[])
       { "file",		OPTF_ARGREQ,	0,	'f' },
       { "fork",		0,		0,	'd' },
       { "daemon",	0,		0,	'd' },
+      { "syslog",	0,		0,	'l' },
+      { "log",		0,		0,	'l' },
       { "quiet",	0,		0,	'q' },
 
       /* --- Magic terminator --- */
 
       { 0,		0,		0,	0 }
     };
-    int i = mdwopt(argc, argv, "+hvu go f:d", opts, 0, 0, 0);
+    int i = mdwopt(argc, argv, "+hvu go f:dl", opts, 0, 0, 0);
 
     if (i < 0)
       break;
@@ -429,6 +449,9 @@ int main(int argc, char *argv[])
       case 'd':
 	f |= f_fork;
 	break;
+      case 'l':
+	f |= f_syslog;
+	break;
       case 'q':
 	flags |= FW_QUIET;
 	break;
@@ -479,7 +502,9 @@ int main(int argc, char *argv[])
     kid = fork();
     if (kid != 0)
       _exit(0);
+  }
 
+  if (f & f_syslog) {
     flags |= FW_SYSLOG;
     openlog(QUIS, 0, LOG_DAEMON);
   }