X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=inn-innduct.git;a=blobdiff_plain;f=backends%2Finnduct.c;h=8e5181a84e9fc797684d20b7446f7163ee7f68bb;hp=58d2870de5b8bed162d49e161635e384584f8834;hb=65ba173dea53ef47288f95aecf8642ac9869181f;hpb=0556ef460c00ebe81f3c23c8bcfcfeb1f937c95d

diff --git a/backends/innduct.c b/backends/innduct.c
index 58d2870..8e5181a 100644
--- a/backends/innduct.c
+++ b/backends/innduct.c
@@ -1,11 +1,9 @@
 /*
  * TODO
- *  - close idle connections
- *  - cope better with garbage in feed file
- *  - cope better with NULs in feed file
- *  - check all structs initialised
- *  - check all fd watches properly undone
- *  - check all init functions called
+ *  - actually implement badusage
+ *  - options for all options
+ *  - manpage
+ *  - pid, sitename, hostname in lockfile
  *  - -k kill mode ?
  */
 
@@ -72,8 +70,8 @@
 
    OVERALL STATES:
 
-  	    					                START
-                                                                  |
+								START
+								  |
      ,-->--.                                                 check F, D
      |     |                                                      |
      |     |                                                      |
@@ -135,14 +133,14 @@
      |     V  duct unlinks D                   	       	 D: duct reading
      |     |                            		      |
      `--<--'                            		      | duct finishes
-                                               	       	      |  processing D
-                                                              | duct unlinks D
-                                                              | duct exits
-                                                              V
-       	       	       	       	       	       	       	Dropped
-  							 F: ENOENT
-  							 D: ENOENT
-  							 duct not running
+							      |  processing D
+							      | duct unlinks D
+							      | duct exits
+							      V
+							Dropped
+							 F: ENOENT
+							 D: ENOENT
+							 duct not running
 
    "duct reading" means innduct is reading the file but also
    overwriting processed tokens.
@@ -158,7 +156,7 @@ perl -ne 'print if m/-8\<-/..m/-\>8-/; print "\f" if m/-\^L-/' backends/innduct.
 
 /*============================== PROGRAM ==============================*/
 
-#define _GNU_SOURCE
+#define _GNU_SOURCE 1
 
 #include "config.h"
 #include "storage.h"
@@ -193,8 +191,6 @@ perl -ne 'print if m/-8\<-/..m/-\>8-/; print "\f" if m/-\^L-/' backends/innduct.
 
 /*----- general definitions, probably best not changed -----*/
 
-#define PERIOD_SECONDS 60
-
 #define CONNCHILD_ESTATUS_STREAM   4
 #define CONNCHILD_ESTATUS_NOSTREAM 5
 
@@ -203,28 +199,35 @@ perl -ne 'print if m/-8\<-/..m/-\>8-/; print "\f" if m/-\^L-/' backends/innduct.
 
 #define MAX_LINE_FEEDFILE (NNTP_MSGID_MAXLEN + sizeof(TOKEN)*2 + 10)
 
+#define VA                va_list al;  va_start(al,fmt)
+#define PRINTF(f,a)       __attribute__((__format__(printf,f,a)))
+#define NORET_PRINTF(f,a) __attribute__((__noreturn__,__format__(printf,f,a)))
+
 /*----- doubly linked lists -----*/
 
-#define ISNODE(T)   struct { T *succ, *pred; } node  /* must be at start */
-#define DEFLIST(T)  typedef struct { T *hd, *tl, *tp; int count; } T##List
+#define ISNODE(T)   struct node list_node
+#define DEFLIST(T)				\
+   typedef struct {				\
+     union { struct list li; T *for_type; } u;	\
+     int count;					\
+   } T##List
 
-#define NODE(n) (assert((void*)&(n)->node == &(n)), \
-		 (struct node*)&(n)->node)
+#define NODE(n) (assert((void*)&(n)->list_node == &(n)), &(n)->list_node)
 
 #define LIST_CHECKCANHAVENODE(l,n) \
-  ((void)((n) == ((l).hd))) /* just for the type check */
+  ((void)((n) == ((l).u.for_type))) /* just for the type check */
 
-#define LIST_ADDSOMEHOW(l,n,list_addsomehow)		\
- ( LIST_CHECKCANHAVENODE(l,n),				\
-   list_addsomehow((struct list*)&(l), NODE((n))),	\
-   (void)(l).count++					\
+#define LIST_ADDSOMEHOW(l,n,list_addsomehow)	\
+ ( LIST_CHECKCANHAVENODE(l,n),			\
+   list_addsomehow(&(l).u.li, NODE((n))),	\
+   (void)(l).count++				\
    )
 
 #define LIST_REMSOMEHOW(l,list_remsomehow)	\
- ( (typeof((l).hd))				\
+ ( (typeof((l).u.for_type))			\
    ( (l).count					\
      ? ( (l).count--,				\
-	 list_remsomehow((struct list*)&(l)) )	\
+	 list_remsomehow(&(l).u.li) )		\
      : 0					\
      )						\
    )
@@ -235,7 +238,8 @@ perl -ne 'print if m/-8\<-/..m/-\>8-/; print "\f" if m/-\^L-/' backends/innduct.
 #define LIST_REMHEAD(l) LIST_REMSOMEHOW((l),list_remhead)
 #define LIST_REMTAIL(l) LIST_REMSOMEHOW((l),list_remtail)
 
-#define LIST_HEAD(l) ((typeof((l).hd))(list_head((struct list*)&(l))))
+#define LIST_INIT(l) (list_new(&(l).u.li))
+#define LIST_HEAD(l) ((typeof((l).u.for_type))(list_head((struct list*)&(l))))
 #define LIST_NEXT(n) ((typeof(n))list_succ(NODE((n))))
 #define LIST_BACK(n) ((typeof(n))list_pred(NODE((n))))
 
@@ -272,32 +276,36 @@ static void *conn_write_some_xmits(Conn *conn);
 
 static void xmit_free(XmitDetails *d);
 
+#define SMS(newstate, periods, why) \
+   (statemc_setstate(sm_##newstate,(periods),#newstate,(why)))
 static void statemc_setstate(StateMachineState newsms, int periods,
 			     const char *forlog, const char *why);
+
 static void statemc_start_flush(const char *why); /* Normal => Flushing */
 static void spawn_inndcomm_flush(const char *why); /* Moved => Flushing */
 
-static void check_master_queue(void);
+static void check_assign_articles(void);
 static void queue_check_input_done(void);
 
 static void statemc_check_flushing_done(void);
 static void statemc_check_backlog_done(void);
 
-static void postfork(const char *what);
-static void postfork_inputfile(InputFile *ipf);
+static void postfork(void);
 
 static void open_defer(void);
 static void close_defer(void);
 static void search_backlog_file(void);
 
-static void inputfile_tailing_start(InputFile *ipf);
-static void inputfile_tailing_stop(InputFile *ipf);
+static void inputfile_reading_start(InputFile *ipf);
+static void inputfile_reading_stop(InputFile *ipf);
 
-static int filemon_init(void);
 static void filemon_start(InputFile *ipf);
 static void filemon_stop(InputFile *ipf);
 static void filemon_callback(InputFile *ipf);
 
+static void vconnfail(Conn *conn, const char *fmt, va_list al) PRINTF(2,0);
+static void connfail(Conn *conn, const char *fmt, ...)         PRINTF(2,3);
+
 /*----- configuration options -----*/
 
 static const char *sitename, *feedfile, *pathoutgoing;
@@ -307,6 +315,8 @@ static int quiet_multiple=0, become_daemon=1;
 static int max_connections=10, max_queue_per_conn=200;
 static int target_max_feedfile_size=100000;
 
+static int period_seconds=60;
+
 static double max_bad_data_ratio= 0.01;
 static int max_bad_data_initial= 30;
   /* in one corrupt 4096-byte block the number of newlines has
@@ -316,7 +326,7 @@ static int connection_setup_timeout=200, port=119, try_stream=1;
 static int inndcomm_flush_timeout=100;
 static int reconnect_delay_periods, flushfail_retry_periods, open_wait_periods;
 static int backlog_retry_minperiods, backlog_spontaneous_rescan_periods;
-static int spontaneous_flush_periods;
+static int spontaneous_flush_periods, need_activity_periods;
 static const char *inndconffile;
 
 static double nocheck_thresh_pct= 95.0;
@@ -386,7 +396,7 @@ struct InputFile {
   int fd;
   Filemon_Perfile *filemon;
 
-  oop_read *rd;
+  oop_read *rd; /* non-0: reading; 0: constructing, or had EOF */
   long inprogress; /* no. of articles read but not processed */
   off_t offset;
   int skippinglong;
@@ -428,7 +438,9 @@ static const char *sms_names[]= {
 
 struct Conn {
   ISNODE(Conn);
-  int fd, max_queue, stream, quitting;
+  int fd; /* may be 0, meaning closed (during construction/destruction) */
+  int max_queue, stream, quitting;
+  int since_activity; /* periods */
   ArticleList waiting; /* not yet told peer */
   ArticleList priority; /* peer says send it now */
   ArticleList sent; /* offered/transmitted - in xmit or waiting reply */
@@ -438,33 +450,27 @@ struct Conn {
 };
 
 
-/*----- operational variables -----*/
+/*----- general operational variables -----*/
 
+/* main initialises */
 static oop_source *loop;
-
-static int until_connect;
 static ConnList conns;
 static ArticleList queue;
-
 static char *path_lock, *path_flushing, *path_defer, *globpat_backlog;
 
-#define SMS(newstate, periods, why) \
-   (statemc_setstate(sm_##newstate,(periods),#newstate,(why)))
-
+/* statemc_init initialises */
 static StateMachineState sms;
 static FILE *defer;
 static InputFile *main_input_file, *flushing_input_file, *backlog_input_file;
-static int sm_period_counter, until_backlog_nextscan;
+static int sm_period_counter;
 
+/* initialisation to 0 is good */
+static int until_connect, until_backlog_nextscan;
 static double accept_proportion;
 static int nocheck, nocheck_reported;
 
 /*========== logging ==========*/
 
-#define VA                va_list al;  va_start(al,fmt)
-#define PRINTF(f,a)       __attribute__((__format__(printf,f,a)))
-#define NORET_PRINTF(f,a) __attribute__((__noreturn__,__format__(printf,f,a)))
-
 static void logcore(int sysloglevel, const char *fmt, ...) PRINTF(2,3);
 static void logcore(int sysloglevel, const char *fmt, ...) {
   VA;
@@ -541,15 +547,29 @@ static char *xasprintf(const char *fmt, ...) {
   return str;
 }
 
-static void perhaps_close(int *fd) { if (*fd) { close(*fd); fd=0; } }
+static int close_perhaps(int *fd) {
+  if (!*fd) return 0;
+  int r= close(*fd);
+  *fd=0;
+  return r;
+}
+static void xclose(int fd, const char *what, const char *what2) {
+  int r= close(fd);
+  if (r) sysdie("close %s%s",what,what2?what2:"");
+}
+static void xclose_perhaps(int *fd, const char *what, const char *what2) {
+  if (!*fd) return;
+  xclose(*fd,what,what2);
+  *fd=0;
+}
 
 static pid_t xfork(const char *what) {
   pid_t child;
 
   child= fork();
   if (child==-1) sysdie("cannot fork for %s",what);
-  if (!child) postfork(what);
   debug("forked %s %ld", what, (unsigned long)child);
+  if (!child) postfork();
   return child;
 }
 
@@ -566,7 +586,7 @@ static void report_child_status(const char *what, int status) {
   if (WIFEXITED(status)) {
     int es= WEXITSTATUS(status);
     if (es)
-      warn("%s: child died with error exit status %d",es);
+      warn("%s: child died with error exit status %d", what, es);
   } else if (WIFSIGNALED(status)) {
     int sig= WTERMSIG(status);
     const char *sigstr= strsignal(sig);
@@ -577,7 +597,7 @@ static void report_child_status(const char *what, int status) {
       warn("%s: child died due to unknown fatal signal %d%s",
 	   what, sig, coredump);
   } else {
-    warn("%s: child died with unknown wait status %d", status);
+    warn("%s: child died with unknown wait status %d", what,status);
   }
 }
 
@@ -666,25 +686,128 @@ static char *sanitise(const char *input) {
   return sanibuf;
 }
 
-/*========== making new connections ==========*/
+static int isewouldblock(int errnoval) {
+  return errnoval==EWOULDBLOCK || errnoval==EAGAIN;
+}
+
+/*========== management of connections ==========*/
+
+static void conn_closefd(Conn *conn, const char *msgprefix) {
+  int r= close_perhaps(&conn->fd);
+  if (r) info("C%d %serror closing socket: %s",
+	      conn->fd, msgprefix, strerror(errno));
+}
 
 static void conn_dispose(Conn *conn) {
   if (!conn) return;
-  perhaps_close(&conn->fd);
+  if (conn->fd) {
+    loop->cancel_fd(loop, conn->fd, OOP_WRITE);
+    loop->cancel_fd(loop, conn->fd, OOP_EXCEPTION);
+  }
+  conn_closefd(conn,"");
   free(conn);
   until_connect= reconnect_delay_periods;
 }
 
-static int connecting_sockets[2]= {-1,-1};
-static pid_t connecting_child;
+static void *conn_exception(oop_source *lp, int fd,
+			    oop_event ev, void *conn_v) {
+  Conn *conn= conn_v;
+  unsigned char ch;
+  assert(fd == conn->fd);
+  assert(ev == OOP_EXCEPTION);
+  int r= read(conn->fd, &ch, 1);
+  if (r<0) connfail(conn,"read failed: %s",strerror(errno));
+  else connfail(conn,"exceptional condition on socket (peer sent urgent"
+		" data? read(,&ch,1)=%d,ch='\\x%02x')",r,ch);
+  return OOP_CONTINUE;
+}  
 
-static void connect_attempt_discard(void) {
-  if (connecting_sockets[0])
-    cancel_fd_read_except(connecting_sockets[0]);
+static void vconnfail(Conn *conn, const char *fmt, va_list al) {
+  int requeue[art_MaxState];
+
+  Article *art;
+  while ((art= LIST_REMHEAD(conn->priority))) LIST_ADDTAIL(queue, art);
+  while ((art= LIST_REMHEAD(conn->waiting))) LIST_ADDTAIL(queue, art);
+  while ((art= LIST_REMHEAD(conn->sent))) {
+    requeue[art->state]++;
+    if (art->state==art_Unsolicited) art->state= art_Unchecked;
+    LIST_ADDTAIL(queue,art);
+  }
+
+  int i;
+  XmitDetails *d;
+  for (i=0, d=conn->xmitd; i<conn->xmitu; i++, d++)
+    xmit_free(d);
+
+  char *m= xvasprintf(fmt,al);
+  warn("C%d connection failed (requeueing " RCI_TRIPLE_FMT_BASE "): %s",
+       conn->fd, RCI_TRIPLE_VALS_BASE(requeue, /*nothing*/), m);
+  free(m);
+
+  LIST_REMOVE(conns,conn);
+  conn_dispose(conn);
+  check_assign_articles();
+}
 
-  perhaps_close(&connecting_sockets[0]);
-  perhaps_close(&connecting_sockets[1]);
+static void connfail(Conn *conn, const char *fmt, ...) {
+  va_list al;
+  va_start(al,fmt);
+  vconnfail(conn,fmt,al);
+  va_end(al);
+}
+
+static void check_idle_conns(void) {
+  Conn *conn;
+  for (conn=LIST_HEAD(conns); conn; conn=LIST_NEXT(conn))
+    conn->since_activity++;
+ search_again:
+  for (conn=LIST_HEAD(conns); conn; conn=LIST_NEXT(conn)) {
+    if (conn->since_activity <= need_activity_periods) continue;
+
+    /* We need to shut this down */
+    if (conn->quitting)
+      connfail(conn,"timed out waiting for response to QUIT");
+    else if (conn->sent.count)
+      connfail(conn,"timed out waiting for responses");
+    else if (conn->waiting.count || conn->priority.count)
+      connfail(conn,"BUG IN INNDUCT conn has queue but nothing sent");
+    else if (conn->xmitu)
+      connfail(conn,"peer has been sending responses"
+	       " before receiving our commands!");
+    else {
+      static const char quitcmd[]= "QUIT\r\n";
+      int todo= sizeof(quitcmd)-1;
+      const char *p= quitcmd;
+      for (;;) {
+	int r= write(conn->fd, p, todo);
+	if (r<0) {
+	  if (isewouldblock(errno))
+	    connfail(conn, "blocked writing QUIT to idle connection");
+	  else
+	    connfail(conn, "failed to write QUIT to idle connection: %s",
+		     strerror(errno));
+	  break;
+	}
+	assert(r<=todo);
+	todo -= r;
+	if (!todo) {
+	  conn->quitting= 1;
+	  conn->since_activity= 0;
+	  debug("C%d is idle, quitting", conn->fd);
+	  break;
+	}
+      }
+    }
+    goto search_again;
+  }
+}  
+
+/*---------- making new connections ----------*/
 
+static pid_t connecting_child;
+static int connecting_fdpass_sock;
+
+static void connect_attempt_discard(void) {
   if (connecting_child) {
     int r= kill(connecting_child, SIGTERM);
     if (r) syswarn("failed to kill connecting child");
@@ -694,6 +817,10 @@ static void connect_attempt_discard(void) {
 	  (WIFSIGNALED(status) && WTERMSIG(status) == SIGKILL)))
       report_child_status("connect", status);
   }
+  if (connecting_fdpass_sock) {
+    cancel_fd_read_except(connecting_fdpass_sock);
+    xclose_perhaps(&connecting_fdpass_sock, "connecting fdpass socket",0);
+  }
 }
 
 #define PREP_DECL_MSG_CMSG(msg)			\
@@ -706,6 +833,8 @@ static void connect_attempt_discard(void) {
 static void *connchild_event(oop_source *lp, int fd, oop_event e, void *u) {
   Conn *conn= 0;
 
+  assert(fd == connecting_fdpass_sock);
+
   conn= xmalloc(sizeof(*conn));
   memset(conn,0,sizeof(*conn));
 
@@ -719,25 +848,29 @@ static void *connchild_event(oop_source *lp, int fd, oop_event e, void *u) {
     if (got != -1) {
       assert(got==connecting_child);
       connecting_child= 0;
-      if (WIFEXITED(status) &&
-	  (WEXITSTATUS(status) != 0 &&
-	   WEXITSTATUS(status) != CONNCHILD_ESTATUS_STREAM &&
-	   WEXITSTATUS(status) != CONNCHILD_ESTATUS_NOSTREAM)) {
-	/* child already reported the problem */
+      if (WIFEXITED(status)) {
+	if (WEXITSTATUS(status) != 0 &&
+	    WEXITSTATUS(status) != CONNCHILD_ESTATUS_STREAM &&
+	    WEXITSTATUS(status) != CONNCHILD_ESTATUS_NOSTREAM)
+	  /* child already reported the problem */;
+	else
+	  warn("connect: connection child exited code %d but no cmsg",
+	       WEXITSTATUS(status));
       } else if (WIFSIGNALED(status) && WTERMSIG(status) == SIGALRM) {
 	warn("connect: connection attempt timed out");
-      } else if (!WIFEXITED(status)) {
+      } else {
 	report_child_status("connect", status);
-	/* that's probably the root cause then */
       }
     } else {
       /* child is still running apparently, report the socket problem */
       if (rs < 0)
-	syswarn("connect: read from child socket failed");
+	syswarn("connect: read from fdpass socket failed");
       else if (e == OOP_EXCEPTION)
-	warn("connect: unexpected exception on child socket");
+	warn("connect: unexpected exception on fdpass socket");
+      else if (!rs)
+	warn("connect: unexpected EOF on fdpass socket");
       else
-	warn("connect: unexpected EOF on child socket");
+	fatal("connect: unexpected lack of cmsg from child");
     }
     goto x;
   }
@@ -752,9 +885,10 @@ static void *connchild_event(oop_source *lp, int fd, oop_event e, void *u) {
   CHK(len,   CMSG_LEN(sizeof(conn->fd)));
 #undef CHK
 
-  if (CMSG_NXTHDR(&msg,h)) { die("connect: child sent many cmsgs"); goto x; }
+  if (CMSG_NXTHDR(&msg,h)) die("connect: child sent many cmsgs");
 
   memcpy(&conn->fd, CMSG_DATA(h), sizeof(conn->fd));
+  loop->on_fd(loop, conn->fd, OOP_EXCEPTION, conn_exception, conn);
 
   int status;
   pid_t got= waitpid(connecting_child, &status, 0);
@@ -772,12 +906,16 @@ static void *connchild_event(oop_source *lp, int fd, oop_event e, void *u) {
   }
 
   /* Phew! */
+  LIST_INIT(conn->waiting);
+  LIST_INIT(conn->priority);
+  LIST_INIT(conn->sent);
   setnonblock(conn->fd, 1);
   conn->max_queue= conn->stream ? max_queue_per_conn : 1;
-  LIST_ADDHEAD(conns, conn);
   notice("C%d connected %s", conn->fd, conn->stream ? "streaming" : "plain");
+  LIST_ADDHEAD(conns, conn);
+
   connect_attempt_discard();
-  check_master_queue();
+  check_assign_articles();
   return 0;
 
  x:
@@ -792,14 +930,14 @@ static int allow_connect_start(void) {
 }
 
 static void connect_start(void) {
-  assert(!connecting_sockets[0]);
-  assert(!connecting_sockets[1]);
   assert(!connecting_child);
+  assert(!connecting_fdpass_sock);
 
   notice("starting connection attempt");
 
-  int r= socketpair(AF_UNIX, SOCK_STREAM, 0, connecting_sockets);
-  if (r) { syswarn("connect: cannot create socketpair for child"); goto x; }
+  int socks[2];
+  int r= socketpair(AF_UNIX, SOCK_STREAM, 0, socks);
+  if (r) { syswarn("connect: cannot create socketpair for child"); return; }
 
   connecting_child= xfork("connection");
 
@@ -808,8 +946,7 @@ static void connect_start(void) {
     char buf[NNTP_STRLEN+100];
     int exitstatus= CONNCHILD_ESTATUS_NOSTREAM;
 
-    r= close(connecting_sockets[0]);
-    if (r) sysdie("connect: close parent socket in child");
+    xclose(socks[0], "(in child) parent's connection fdpass socket",0);
 
     alarm(connection_setup_timeout);
     if (NNTPconnect((char*)remote_host, port, &cn_from, &cn_to, buf) < 0) {
@@ -865,32 +1002,26 @@ static void connect_start(void) {
     memcpy(CMSG_DATA(cmsg), &fd, sizeof(fd));
 
     msg.msg_controllen= cmsg->cmsg_len;
-    r= sendmsg(connecting_sockets[1], &msg, 0);
+    r= sendmsg(socks[1], &msg, 0);
     if (r) sysdie("sendmsg failed for new connection");
 
     _exit(exitstatus);
   }
 
-  r= close(connecting_sockets[1]);  connecting_sockets[1]= 0;
-  if (r) sysdie("connect: close child socket in parent");
-
-  on_fd_read_except(connecting_sockets[0], connchild_event);
-  return;
-
- x:
-  connect_attempt_discard();
+  xclose(socks[1], "connecting fdpass child's socket",0);
+  connecting_fdpass_sock= socks[0];
+  on_fd_read_except(connecting_fdpass_sock, connchild_event);
 }
 
+/*---------- assigning articles to conns, and transmitting ----------*/
 
-/*========== overall control of article flow ==========*/
-
-static void check_master_queue(void) {
+static void check_assign_articles(void) {
   for (;;) {
     if (!queue.count)
       break;
-    
+
     Conn *walk, *use=0;
-    int spare;
+    int spare, inqueue;
 
     /* Find a connection to offer this article.  We prefer a busy
      * connection to an idle one, provided it's not full.  We take the
@@ -899,8 +1030,9 @@ static void check_master_queue(void) {
      * connections, the spare ones will go away eventually.
      */
     for (walk=LIST_HEAD(conns); walk; walk=LIST_NEXT(walk)) {
-      int inqueue= walk->sent.count + walk->priority.count
-	         + walk->waiting.count;
+      if (walk->quitting) continue;
+      inqueue= walk->sent.count + walk->priority.count
+	     + walk->waiting.count;
       spare= walk->max_queue - inqueue;
       assert(inqueue <= max_queue_per_conn);
       assert(spare >= 0);
@@ -908,6 +1040,7 @@ static void check_master_queue(void) {
       else if (spare>0) /*working*/ { use= walk; break; }
     }
     if (use) {
+      if (!inqueue) use->since_activity= 0; /* reset idle counter */
       while (spare>0) {
 	Article *art= LIST_REMHEAD(queue);
 	LIST_ADDTAIL(use->waiting, art);
@@ -952,46 +1085,10 @@ static void conn_maybe_write(Conn *conn)  {
   }
 }
 
-static void vconnfail(Conn *conn, const char *fmt, va_list al) PRINTF(2,0);
-static void vconnfail(Conn *conn, const char *fmt, va_list al) {
-  int requeue[art_MaxState];
-
-  Article *art;
-  while ((art= LIST_REMHEAD(conn->priority))) LIST_ADDTAIL(queue, art);
-  while ((art= LIST_REMHEAD(conn->waiting))) LIST_ADDTAIL(queue, art);
-  while ((art= LIST_REMHEAD(conn->sent))) {
-    requeue[art->state]++;
-    if (art->state==art_Unsolicited) art->state= art_Unchecked;
-    LIST_ADDTAIL(queue,art);
-  }
-
-  int i;
-  XmitDetails *d;
-  for (i=0, d=conn->xmitd; i<conn->xmitu; i++, d++)
-    xmit_free(d);
-
-  char *m= xvasprintf(fmt,al);
-  warn("C%d connection failed (requeueing " RCI_TRIPLE_FMT_BASE "): %s",
-       conn->fd, RCI_TRIPLE_VALS_BASE(requeue, /*nothing*/), m);
-  free(m);
-
-  LIST_REMOVE(conns,conn);
-  conn_dispose(conn);
-  check_master_queue();
-}
-
-static void connfail(Conn *conn, const char *fmt, ...) PRINTF(2,3);
-static void connfail(Conn *conn, const char *fmt, ...) {
-  va_list al;
-  va_start(al,fmt);
-  vconnfail(conn,fmt,al);
-  va_end(al);
-}
-
 /*========== article transmission ==========*/
 
 static XmitDetails *xmit_core(Conn *conn, const char *data, int len,
-                  XmitKind kind) { /* caller must then fill in details */
+		  XmitKind kind) { /* caller must then fill in details */
   struct iovec *v= &conn->xmit[conn->xmitu];
   XmitDetails *d= &conn->xmitd[conn->xmitu++];
   v->iov_base= (char*)data;
@@ -1032,7 +1129,7 @@ static void *conn_write_some_xmits(Conn *conn) {
     if (count > IOV_MAX) count= IOV_MAX;
     ssize_t rs= writev(conn->fd, conn->xmit, count);
     if (rs < 0) {
-      if (errno == EAGAIN) return OOP_CONTINUE;
+      if (isewouldblock(errno)) return OOP_CONTINUE;
       connfail(conn, "write failed: %s", strerror(errno));
       return OOP_HALT;
     }
@@ -1131,7 +1228,7 @@ static void *peer_rd_err(oop_source *lp, oop_read *oread, oop_event ev,
 static Article *article_reply_check(Conn *conn, const char *response,
 				    int code_indicates_streaming,
 				    int must_have_sent
-				        /* 1:yes, -1:no, 0:dontcare */,
+					/* 1:yes, -1:no, 0:dontcare */,
 				    const char *sanitised_response) {
   Article *art= LIST_HEAD(conn->sent);
 
@@ -1207,6 +1304,7 @@ static void article_done(Conn *conn, Article *art, int whichcount) {
   else if (whichcount == RC_unwanted) update_nocheck(0);
 
   InputFile *ipf= art->ipf;
+
   while (art->blanklen) {
     static const char spaces[]=
       "                                                                "
@@ -1227,11 +1325,10 @@ static void article_done(Conn *conn, Article *art, int whichcount) {
 
   ipf->inprogress--;
   assert(ipf->inprogress >= 0);
+  free(art);
 
   if (!ipf->inprogress && ipf != main_input_file)
     queue_check_input_done();
-
-  free(art);
 }
 
 static void *peer_rd_ok(oop_source *lp, oop_read *oread, oop_event ev,
@@ -1258,7 +1355,7 @@ static void *peer_rd_ok(oop_source *lp, oop_read *oread, oop_event ev,
     if (code!=205 && code!=503) {
       connfail(conn, "peer gave unexpected response to QUIT: %s", sani);
     } else {
-      notice("C%d idle connection closed\n");
+      notice("C%d idle connection closed", conn->fd);
       assert(!conn->waiting.count);
       assert(!conn->priority.count);
       assert(!conn->sent.count);
@@ -1269,6 +1366,7 @@ static void *peer_rd_ok(oop_source *lp, oop_read *oread, oop_event ev,
     return OOP_CONTINUE;
   }
 
+  conn->since_activity= 0;
   Article *art;
 
 #define GET_ARTICLE(musthavesent)					    \
@@ -1323,7 +1421,7 @@ static void *peer_rd_ok(oop_source *lp, oop_read *oread, oop_event ev,
   }
 
   conn_maybe_write(conn);
-  check_master_queue();
+  check_assign_articles();
   return OOP_CONTINUE;
 }
 
@@ -1332,15 +1430,11 @@ static void *peer_rd_ok(oop_source *lp, oop_read *oread, oop_event ev,
 
 static void feedfile_eof(InputFile *ipf) {
   assert(ipf != main_input_file); /* promised by tailing_try_read */
-
-  inputfile_tailing_stop(ipf);
-  assert(ipf->fd >= 0);
-  if (close(ipf->fd)) sysdie("could not close input file %s", ipf->path);
-  ipf->fd= -1;
+  inputfile_reading_stop(ipf);
 
   if (ipf == flushing_input_file) {
     assert(sms==sm_SEPARATED || sms==sm_DROPPING);
-    if (main_input_file) inputfile_tailing_start(main_input_file);
+    if (main_input_file) inputfile_reading_start(main_input_file);
     statemc_check_flushing_done();
   } else if (ipf == backlog_input_file) {
     statemc_check_backlog_done();
@@ -1355,6 +1449,7 @@ static InputFile *open_input_file(const char *path) {
     if (errno==ENOENT) return 0;
     sysfatal("unable to open input file %s", path);
   }
+  assert(fd>0);
 
   InputFile *ipf= xmalloc(sizeof(*ipf) + strlen(path) + 1);
   memset(ipf,0,sizeof(*ipf));
@@ -1365,14 +1460,12 @@ static InputFile *open_input_file(const char *path) {
   return ipf;
 }
 
-static void close_input_file(InputFile *ipf) {
+static void close_input_file(InputFile *ipf) { /* does not free */
   assert(!ipf->readable_callback); /* must have had ->on_cancel */
-  assert(!ipf->filemon); /* must have had inputfile_tailing_stop */
-  assert(!ipf->rd); /* must have had inputfile_tailing_stop */
+  assert(!ipf->filemon); /* must have had inputfile_reading_stop */
+  assert(!ipf->rd); /* must have had inputfile_reading_stop */
   assert(!ipf->inprogress); /* no dangling pointers pointing here */
-
-  if (ipf->fd >= 0)
-    if (close(ipf->fd)) sysdie("could not close input file %s", ipf->path);
+  xclose_perhaps(&ipf->fd, "input file ", ipf->path);
 }
 
 
@@ -1437,7 +1530,7 @@ static void *feedfile_got_article(oop_source *lp, oop_read *rd,
     ipf->readcount_blank++;
     return OOP_CONTINUE;
   }
-  
+
   char *space= strchr(data,' ');
   int tokenlen= space-data;
   int midlen= (int)recsz-tokenlen-1;
@@ -1452,12 +1545,12 @@ static void *feedfile_got_article(oop_source *lp, oop_read *rd,
   ipf->readcount_ok++;
 
   art= xmalloc(sizeof(*art) - 1 + midlen + 1);
-  art->offset= ipf->offset;
-  art->blanklen= recsz;
-  art->midlen= midlen;
   art->state= art_Unchecked;
+  art->midlen= midlen;
   art->ipf= ipf;  ipf->inprogress++;
   art->token= TextToToken(tokentextbuf);
+  art->offset= ipf->offset;
+  art->blanklen= recsz;
   strcpy(art->messageid, space+1);
   LIST_ADDTAIL(queue, art);
 
@@ -1465,7 +1558,7 @@ static void *feedfile_got_article(oop_source *lp, oop_read *rd,
       ipf->offset >= target_max_feedfile_size)
     statemc_start_flush("feed file size");
 
-  check_master_queue();
+  check_assign_articles();
   return OOP_CONTINUE;
 }
 
@@ -1519,10 +1612,10 @@ static ssize_t tailing_try_read(struct oop_readable *rable, void *buffer,
 	errno=EAGAIN;
 	return -1;
       } else if (ipf==flushing_input_file) {
-	assert(ipf->fd>=0);
+	assert(ipf->rd);
 	assert(sms==sm_SEPARATED || sms==sm_DROPPING);
       } else if (ipf==backlog_input_file) {
-	assert(ipf->fd>=0);
+	assert(ipf->rd);
       } else {
 	abort();
       }
@@ -1582,7 +1675,7 @@ static void *filemon_inotify_readable(oop_source *lp, int fd,
   for (;;) {
     int r= read(filemon_inotify_fd, &iev, sizeof(iev));
     if (r==-1) {
-      if (errno==EAGAIN) break;
+      if (isewouldblock(errno)) break;
       sysdie("read from inotify master");
     } else if (r==sizeof(iev)) {
       assert(iev.wd >= 0 && iev.wd < filemon_inotify_wdmax);
@@ -1652,8 +1745,8 @@ static const oop_rd_style feedfile_rdstyle= {
   OOP_RD_SHORTREC_LONG,
 };
 
-static void inputfile_tailing_start(InputFile *ipf) {
-  assert(!ipf->fd);
+static void inputfile_reading_start(InputFile *ipf) {
+  assert(!ipf->rd);
   ipf->readable.on_readable= tailing_on_readable;
   ipf->readable.on_cancel=   tailing_on_cancel;
   ipf->readable.try_read=    tailing_try_read;
@@ -1664,15 +1757,15 @@ static void inputfile_tailing_start(InputFile *ipf) {
   ipf->readable_callback_user= 0;
 
   ipf->rd= oop_rd_new(loop, &ipf->readable, 0,0);
-  assert(ipf->fd);
+  assert(ipf->rd);
 
   int r= oop_rd_read(ipf->rd, &feedfile_rdstyle, MAX_LINE_FEEDFILE,
 		     feedfile_got_article,ipf, feedfile_read_err, ipf);
   if (r) sysdie("unable start reading feedfile %s",ipf->path);
 }
 
-static void inputfile_tailing_stop(InputFile *ipf) {
-  assert(ipf->fd);
+static void inputfile_reading_stop(InputFile *ipf) {
+  assert(ipf->rd);
   oop_rd_cancel(ipf->rd);
   oop_rd_delete(ipf->rd);
   ipf->rd= 0;
@@ -1688,16 +1781,16 @@ static void inputfile_tailing_stop(InputFile *ipf) {
 
 	    .=======.
 	    ||START||
-            `======='
-                |
-                | open F
-                |
-                |    F ENOENT
-                |`---------------------------------------------------.
+	    `======='
+		|
+		| open F
+		|
+		|    F ENOENT
+		|`---------------------------------------------------.
       F OPEN OK |                                                    |
-                |`---------------- - - -                             |
+		|`---------------- - - -                             |
        D ENOENT |       D EXISTS   see OVERALL STATES diagram        |
-                |                  for full startup logic            |
+		|                  for full startup logic            |
      ,--------->|                                                    |
      |          V                                                    |
      |     ============                                       try to |
@@ -1739,7 +1832,7 @@ static void inputfile_tailing_stop(InputFile *ipf) {
      |          V             |     |              V
      |     =============      V     V          	  ============
      |      SEPARATED-1       |     |              DROPPING-1
-     |      flsh->fd>=0       |     |              flsh->fd>=0
+     |      flsh->rd!=0       |     |              flsh->rd!=0
      |     [Separated]        |     |             [Dropping]
      |      main F idle       |     |              main none
      |      old D tail        |     |              old D tail
@@ -1749,7 +1842,7 @@ static void inputfile_tailing_stop(InputFile *ipf) {
      |          V             |     |               V
      |     ===============    |     |             ===============
      |      SEPARATED-2       |     |              DROPPING-2
-     |      flsh->fd==-1      |     V              flsh->fd==-1
+     |      flsh->rd==0       |     V              flsh->rd==0
      |     [Finishing]        |     |             [Dropping]
      |      main F tail	      |     `.             main none
      |      old D closed      |       `.           old D closed
@@ -1762,29 +1855,29 @@ static void inputfile_tailing_stop(InputFile *ipf) {
      |          |                                  |  |
      |          |                                  V  V
      `----------'                               ==============
-                                                 DROPPED
-                                                [Dropped]
-                                                 main none
-                                                 old none
-                                                 some backlog
-                                                ==============
-                                                      |
-                                                      | ALL BACKLOG DONE
-                                                      |
-                                                      | unlink lock
-                                                      | exit
-                                                      V
-                                                  ==========
-					           (ESRCH)
-					          [Droppped]
-					          ==========
+						 DROPPED
+						[Dropped]
+						 main none
+						 old none
+						 some backlog
+						==============
+						      |
+						      | ALL BACKLOG DONE
+						      |
+						      | unlink lock
+						      | exit
+						      V
+						  ==========
+						   (ESRCH)
+						  [Droppped]
+						  ==========
  * ->8-
  */
 
 static void startup_set_input_file(InputFile *f) {
   assert(!main_input_file);
   main_input_file= f;
-  inputfile_tailing_start(f);
+  inputfile_reading_start(f);
 }
 
 static void statemc_init(void) {
@@ -1805,7 +1898,7 @@ static void statemc_init(void) {
     fl.l_whence= SEEK_SET;
     int r= fcntl(lockfd, F_SETLK, &fl);
     if (r==-1) {
-      if (errno==EACCES || errno==EAGAIN) {
+      if (errno==EACCES || isewouldblock(errno)) {
 	if (quiet_multiple) exit(0);
 	fatal("another duct holds the lockfile");
       }
@@ -1819,8 +1912,7 @@ static void statemc_init(void) {
     if (!lock_noent && samefile(&stab, &stabf))
       break;
 
-    if (close(lockfd))
-      sysdie("could not close stale lockfile %s", path_lock);
+    xclose(lockfd, "stale lockfile ", path_lock);
   }
   debug("startup: locked");
 
@@ -1921,7 +2013,7 @@ static void statemc_period_poll(void) {
 static int inputfile_is_done(InputFile *ipf) {
   if (!ipf) return 0;
   if (ipf->inprogress) return 0; /* new article in the meantime */
-  if (ipf->fd >= 0); return 0; /* not had EOF */
+  if (ipf->rd) return 0; /* not had EOF */
   return 1;
 }
 
@@ -1959,7 +2051,7 @@ static void statemc_check_backlog_done(void) {
   const char *rest= under ? under+1 : leaf;
   if (!strncmp(rest,"backlog",7)) rest += 7;
   notice_processed(ipf,"backlog:",rest);
-  
+
   close_input_file(ipf);
   if (unlink(ipf->path)) {
     if (errno != ENOENT)
@@ -2023,7 +2115,7 @@ static void statemc_setstate(StateMachineState newsms, int periods,
     if (!main_input_file) xtra= "-ABSENT";
     break;
   case sm_SEPARATED: case sm_DROPPING:
-    xtra= flushing_input_file->fd >= 0 ? "-1" : "-2";
+    xtra= flushing_input_file->rd ? "-1" : "-2";
     break;
   default:;
   }
@@ -2191,7 +2283,7 @@ static void search_backlog_file(void) {
 
   now= xtime();
   double age= difftime(now, oldest_mtime);
-  long age_deficiency= (backlog_retry_minperiods * PERIOD_SECONDS) - age;
+  long age_deficiency= (backlog_retry_minperiods * period_seconds) - age;
 
   if (age_deficiency <= 0) {
     debug("backlog scan: found age=%f deficiency=%ld oldest=%s",
@@ -2202,12 +2294,12 @@ static void search_backlog_file(void) {
       warn("backlog file %s vanished as we opened it", backlog_input_file);
       goto try_again;
     }
-    inputfile_tailing_start(backlog_input_file);
+    inputfile_reading_start(backlog_input_file);
     until_backlog_nextscan= -1;
     return;
   }
 
-  until_backlog_nextscan= age_deficiency / PERIOD_SECONDS;
+  until_backlog_nextscan= age_deficiency / period_seconds;
 
   if (backlog_spontaneous_rescan_periods >= 0 &&
       until_backlog_nextscan > backlog_spontaneous_rescan_periods)
@@ -2221,12 +2313,14 @@ static void search_backlog_file(void) {
 /*========== flushing the feed ==========*/
 
 static pid_t inndcomm_child;
+static int inndcomm_sentinel_fd;
 
 static void *inndcomm_event(oop_source *lp, int fd, oop_event e, void *u) {
   assert(inndcomm_child);
+  assert(fd == inndcomm_sentinel_fd);
   int status= xwaitpid(&inndcomm_child, "inndcomm");
   cancel_fd_read_except(fd);
-  close(fd);
+  xclose_perhaps(&fd, "inndcomm sentinel pipe",0);
 
   assert(!flushing_input_file);
 
@@ -2240,7 +2334,7 @@ static void *inndcomm_event(oop_source *lp, int fd, oop_event e, void *u) {
       warn("feed has been dropped by innd, finishing up");
       flushing_input_file= main_input_file;
       tailing_queue_readable(flushing_input_file);
-        /* we probably previously returned EAGAIN from our fake read method
+	/* we probably previously returned EAGAIN from our fake read method
 	 * when in fact we were at EOF, so signal another readable event
 	 * so we actually see the EOF */
 
@@ -2300,6 +2394,7 @@ void spawn_inndcomm_flush(const char *why) { /* Moved => Flushing */
 
   assert(sms==sm_NORMAL || sms==sm_FLUSHFAILED);
   assert(!inndcomm_child);
+  assert(!inndcomm_sentinel_fd);
 
   if (pipe(pipefds)) sysdie("create pipe for inndcomm child sentinel");
 
@@ -2310,7 +2405,8 @@ void spawn_inndcomm_flush(const char *why) { /* Moved => Flushing */
     char *reply;
     int r;
 
-    close(pipefds[0]);
+    xclose(pipefds[0], "(in child) inndcomm sentinel parent's end",0);
+    /* parent spots the autoclose of pipefds[1] when we die or exit */
 
     alarm(inndcomm_flush_timeout);
     r= ICCopen();                         if (r)   inndcommfail("connect");
@@ -2322,9 +2418,10 @@ void spawn_inndcomm_flush(const char *why) { /* Moved => Flushing */
     exit(INNDCOMMCHILD_ESTATUS_FAIL);
   }
 
-  close(pipefds[1]);
-  int sentinel_fd= pipefds[0];
-  on_fd_read_except(sentinel_fd, inndcomm_event);
+  xclose(pipefds[1], "inndcomm sentinel child's end",0);
+  inndcomm_sentinel_fd= pipefds[0];
+  assert(inndcomm_sentinel_fd);
+  on_fd_read_except(inndcomm_sentinel_fd, inndcomm_event);
 
   SMS(FLUSHING, 0, why);
 }
@@ -2333,33 +2430,31 @@ void spawn_inndcomm_flush(const char *why) { /* Moved => Flushing */
 
 static void postfork_inputfile(InputFile *ipf) {
   if (!ipf) return;
-  assert(ipf->fd >= 0);
-  close(ipf->fd);
-  ipf->fd= -1;
+  xclose(ipf->fd, "(in child) input file ", ipf->path);
 }
 
-static void postfork_stdio(FILE *f) {
+static void postfork_stdio(FILE *f, const char *what, const char *what2) {
   /* we have no stdio streams that are buffered long-term */
-  if (f) fclose(f);
+  if (!f) return;
+  if (fclose(f)) sysdie("(in child) close %s%s", what, what2?what2:0);
 }
 
-static void postfork(const char *what) {
+static void postfork(void) {
   if (signal(SIGPIPE, SIG_DFL) == SIG_ERR)
-    sysdie("%s child: failed to reset SIGPIPE");
+    sysdie("(in child) failed to reset SIGPIPE");
 
   postfork_inputfile(main_input_file);
   postfork_inputfile(flushing_input_file);
 
   Conn *conn;
   for (conn=LIST_HEAD(conns); conn; conn=LIST_NEXT(conn))
-    close(conn->fd);
+    conn_closefd(conn,"(in child) ");
 
-  postfork_stdio(defer);
+  postfork_stdio(defer, "defer file ", path_defer);
 }
 
 #define EVERY(what, interval_sec, interval_usec, body)			     \
-  static const struct timeval what##_timeout =				     \
-            { interval_sec, interval_usec };				     \
+  static struct timeval what##_timeout = { interval_sec, interval_usec };    \
   static void what##_schedule(void);					     \
   static void *what##_timedout(oop_source *lp, struct timeval tv, void *u) { \
     { body }								     \
@@ -2384,7 +2479,7 @@ static const char *debug_ipf_path(InputFile *ipf) {
   return slash ? slash+1 : ipf->path;
 }
 
-EVERY(period, PERIOD_SECONDS,0, {
+EVERY(period, -1,0, {
   debug("PERIOD"
 	" sms=%s[%d] conns=%d queue=%d until_connect=%d"
 	" input_files" DEBUGF_IPF(main) DEBUGF_IPF(old) DEBUGF_IPF(flushing)
@@ -2401,18 +2496,26 @@ EVERY(period, PERIOD_SECONDS,0, {
   poll_backlog_file();
   if (!backlog_input_file) close_defer(); /* want to start on a new backlog */
   statemc_period_poll();
-  check_master_queue();
+  check_assign_articles();
+  check_idle_conns();
 });
 
 
 /*========== option parsing ==========*/
 
-/*---------- generic option parser and logging ----------*/
-
 static void vbadusage(const char *fmt, va_list al) NORET_PRINTF(1,0);
 static void vbadusage(const char *fmt, va_list al) {
-  abort();
+  char *m= xvasprintf(fmt,al);
+  fprintf(stderr, "bad usage: %s\n%s"
+	  "say --help for help, or read the manpage\n",
+	  m);
+  if (become_daemon)
+    syslog(LOG_CRIT,"innduct: invoked with bad usage: %s",m);
+  exit(8);
 }
+
+/*---------- generic option parser ----------*/
+
 static void badusage(const char *fmt, ...) NORET_PRINTF(1,2);
 static void badusage(const char *fmt, ...) {
   va_list al;
@@ -2430,12 +2533,80 @@ typedef void OptionParser(const Option*, const char *val);
 
 struct Option {
   int shrt;
-  const char *lng;
+  const char *lng, *formarg;
   void *store;
   OptionParser *fn;
-  int noarg, intval;
+  int intval;
 };
 
+static void parse_options(const Option *options, char ***argvp) {
+  /* on return *argvp is first non-option arg; argc is not updated */
+
+  for (;;) {
+    const char *arg= *++(*argvp);
+    if (!arg) break;
+    if (*arg != '-') break;
+    if (!strcmp(arg,"--")) { arg= *++(*argvp); break; }
+    int a;
+    while ((a= *++arg)) {
+      const Option *o;
+      if (a=='-') {
+	arg++;
+	char *equals= strchr(arg,'=');
+	int len= equals ? (equals - arg) : strlen(arg);
+	for (o=options; o->shrt || o->lng; o++)
+	  if (strlen(o->lng) == len && !memcmp(o->lng,arg,len))
+	    goto found_long;
+	badusage("unknown long option --%s",arg);
+      found_long:
+	if (!o->formarg) {
+	  if (equals) badusage("option --%s does not take a value",o->lng);
+	  arg= 0;
+	} else if (equals) {
+	  arg= equals+1;
+	} else {
+	  arg= *++(*argvp);
+	  if (!arg) badusage("option --%s needs a value for %s",
+			     o->lng, o->formarg);
+	}
+	o->fn(o, arg);
+	break; /* eaten the whole argument now */
+      }
+      for (o=options; o->shrt || o->lng; o++)
+	if (a == o->shrt)
+	  goto found_short;
+      badusage("unknown short option -%c",a);
+    found_short:
+      if (!o->formarg) {
+	o->fn(o,0);
+      } else {
+	if (!*++arg) {
+	  arg= *++(*argvp);
+	  if (!arg) badusage("option -%c needs a value for %s",
+			     o->shrt, o->formarg);
+	}
+	o->fn(o,arg);
+	break; /* eaten the whole argument now */
+      }
+    }
+  }
+}
+
+#define DELIMPERHAPS(delim,str)  (str) ? (delim) : "", (str) ? (str) : ""
+
+static void print_options(const Option *options, FILE *f) {
+  const Option *o;
+  for (o=options; o->shrt || o->lng; o++) {
+    char shrt[2] = { o->shrt, 0 };
+    char *optspec= xasprintf("%s%s%s%s%s",
+			     o->shrt ? "-" : "", o->shrt,
+			     o->shrt && o->lng ? "|" : "",
+			     DELIMPERHAPS("--", o->lng));
+    fprintf(f, "  %s%s%s\n", optspec, DELIMPERHAPS(" ", o->formarg));
+    free(optspec);
+  }
+}
+
 /*---------- specific option types ----------*/
 
 static void op_integer(const Option *o, const char *val) {
@@ -2485,8 +2656,8 @@ static void op_seconds(const Option *o, const char *val) {
 static void op_periods_rndup(const Option *o, const char *val) {
   int *store= o->store;
   op_seconds(o,val);
-  *store += PERIOD_SECONDS-1;
-  *store /= PERIOD_SECONDS;
+  *store += period_seconds-1;
+  *store /= period_seconds;
 }
 
 static void op_setint(const Option *o, const char *val) {
@@ -2496,86 +2667,65 @@ static void op_setint(const Option *o, const char *val) {
 
 /*---------- specific options ----------*/
 
-static const Option options[]= {
-{'f',"feedfile",              &feedfile,                 op_string           },
-{'q',"quiet-multiple",        &quiet_multiple,           op_setint,   1,1    },
+static void help(const Option *o, const char *val);
+
+static const Option innduct_options[]= {
+{'f',"feedfile",         "F",   &feedfile,             op_string           },
+{'q',"quiet-multiple",   0,     &quiet_multiple,       op_setint,   1    },
+{0,"help",               0,                            help             },
 
-{ 0, "max-connections",       &max_connections,          op_integer          },
-{ 0, "max-queue-per-conn",    &max_queue_per_conn,       op_integer          },
+{0,"max-connections",    "N",   &max_connections,      op_integer          },
+{0,"max-queue-per-conn", "N",   &max_queue_per_conn,   op_integer          },
 
 
-{ 0, "streaming",             &try_stream,               op_setint,  1,1     },
-{ 0, "no-streaming",          &try_stream,               op_setint,  1,0     },
-{'P',"port",                  &port,                     op_integer          },
-{ 0, "inndconf",              &inndconffile,             op_string           },
-{'d',"daemon",                &become_daemon,            op_setint,  1,1     },
-{ 0, "no-daemon",             &become_daemon,            op_setint,  1,0     },
+{0,"streaming",          0,     &try_stream,           op_setint,  1     },
+{0,"no-streaming",       0,     &try_stream,           op_setint,  0     },
+{'P',"port",             "PORT",&port,                 op_integer          },
+{0,"inndconf",           "F",   &inndconffile,         op_string           },
+{0,"no-daemon",          0,     &become_daemon,        op_setint,  0     },
 
-{ 0, "no-check-proportion",   &nocheck_thresh_pct,       op_double           },
-{ 0, "no-check-filter",       &nocheck_decay_articles,   op_double           },
+{0,"no-check-proportion","PERCENT", &nocheck_thresh_pct,      op_double },
+{0,"no-check-filter",    "ARTICLES", &nocheck_decay_articles, op_double },
 
-{ 0, "reconnect-interval",    &reconnect_delay_periods,  op_periods_rndup    },
-{ 0, "flush-retry-interval",  &flushfail_retry_periods,  op_periods_rndup    },
-{ 0, "inndcomm-timeout",      &inndcomm_flush_timeout,   op_seconds          },
+{0,"reconnect-interval",  "TIME", &reconnect_delay_periods, op_periods_rndup },
+{0,"flush-retry-interval","TIME", &flushfail_retry_periods, op_periods_rndup },
+{0,"inndcomm-timeout",    "TIME",  &inndcomm_flush_timeout,   op_seconds },
+{0,0}
 };
 
-int main(int argc, char **argv) {
-  const char *arg;
+static void printusage(FILE *f) {
+  fputs("usage: innduct [options] site [fqdn]\n"
+	"available options are:\n", f);
+  print_options(innduct_options, f);
+}
 
-  for (;;) {
-    arg= *++argv;
-    if (!arg) break;
-    if (*arg != '-') break;
-    if (!strcmp(arg,"--")) { arg= *++argv; break; }
-    int a;
-    while ((a= *++arg)) {
-      const Option *o;
-      if (a=='-') {
-	arg++;
-	char *equals= strchr(arg,'=');
-	int len= equals ? (equals - arg) : strlen(arg);
-	for (o=options; o->lng; o++)
-	  if (strlen(o->lng) == len && !memcmp(o->lng,arg,len))
-	    goto found_long;
-	badusage("unknown long option --%s",arg);
-      found_long:
-	if (o->noarg) {
-	  if (equals) badusage("option --%s does not take a value",o->lng);
-	  arg= 0;
-	} else if (equals) {
-	  arg= equals+1;
-	} else {
-	  arg= *++argv;
-	  if (!arg) badusage("option --%s needs a value",o->lng);
-	}
-	o->fn(o, arg);
-	break; /* eaten the whole argument now */
-      }
-      for (o=options; o->lng; o++)
-	if (a == o->shrt)
-	  goto found_short;
-      badusage("unknown short option -%c",a);
-    found_short:
-      if (o->noarg) {
-	o->fn(o,0);
-      } else {
-	if (!*++arg) {
-	  arg= *++argv;
-	  if (!arg) badusage("option -%c needs a value",o->shrt);
-	}
-	o->fn(o,arg);
-	break; /* eaten the whole argument now */
-      }
-    }
+static void help(const Option *o, const char *val) {
+  printusage(stdout);
+  if (ferror(stdout) || fflush(stdout)) {
+    perror("innduct: writing help");
+    exit(12);
+  }
+  exit(0);
+}
+
+int main(int argc, char **argv) {
+  if (!argv[1]) {
+    printusage(stderr);
+    exit(12);
   }
 
-  if (!arg) badusage("need site name argument");
-  sitename= arg;
+  parse_options(innduct_options, &argv);
+
+  /* arguments */
+
+  sitename= *argv++;
+  if (!sitename) badusage("need site name argument");
+  remote_host= *argv++;
+  if (*argv) badusage("too many non-option arguments");
 
-  if ((arg= *++argv))
-    remote_host= arg;
+  /* defaults */
 
-  if (*++argv) badusage("too many non-option arguments");
+  if (!remote_host) remote_host= sitename;
 
   if (nocheck_thresh_pct < 0 || nocheck_thresh_pct > 100)
     badusage("nocheck threshold percentage must be between 0..100");
@@ -2602,6 +2752,8 @@ int main(int argc, char **argv) {
     if (strchr(feedfile, c))
       badusage("feed filename may not contain metacharacter %c",c);
 
+  /* set things up */
+
   oop_source_sys *sysloop= oop_sys_new();
   if (!sysloop) sysdie("could not create liboop event loop");
   loop= (oop_source*)sysloop;
@@ -2609,6 +2761,9 @@ int main(int argc, char **argv) {
   if (signal(SIGPIPE, SIG_IGN) == SIG_ERR)
     sysdie("could not ignore SIGPIPE");
 
+  LIST_INIT(conns);
+  LIST_INIT(queue);
+
   if (become_daemon) {
     int i;
     for (i=3; i<255; i++)
@@ -2621,7 +2776,7 @@ int main(int argc, char **argv) {
     dup2(null,0);
     dup2(null,1);
     dup2(null,2);
-    close(null);
+    xclose(null, "/dev/null original fd",0);
 
     pid_t child1= xfork("daemonise first fork");
     if (child1) _exit(0);
@@ -2640,10 +2795,13 @@ int main(int argc, char **argv) {
     filepoll_schedule();
   }
 
+  period_timeout.tv_sec= period_seconds;
   period_schedule();
 
   statemc_init();
 
+  /* let's go */
+
   void *r= oop_sys_run(sysloop);
   assert(r == OOP_ERROR);
   sysdie("event loop failed");