X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=inn-innduct.git;a=blobdiff_plain;f=backends%2Finnduct.c;h=85e5d6541ebb036da8709f265597b1f0c090b782;hp=944a31d429be2c44fceb296aa3ce03d363aa7151;hb=d3f32ccfd4a014eb5dac4e36efdcb7d95c57c451;hpb=b91ec9fc812ea51606d970652ccff5886d0fe8bf

diff --git a/backends/innduct.c b/backends/innduct.c
index 944a31d..85e5d65 100644
--- a/backends/innduct.c
+++ b/backends/innduct.c
@@ -1116,12 +1116,13 @@ static void vconnfail(Conn *conn, const char *fmt, va_list al) {
   for (i=0, d=conn->xmitd; i<conn->xmitu; i++, d++)
     xmit_free(d);
 
+  LIST_REMOVE(conns,conn);
+
   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);
+  warn("C%d (now %d) connection failed requeueing " RCI_TRIPLE_FMT_BASE ": %s",
+       conn->fd, conns.count, RCI_TRIPLE_VALS_BASE(requeue, /*nothing*/), m);
   free(m);
 
-  LIST_REMOVE(conns,conn);
   conn_dispose(conn);
   check_assign_articles();
 }
@@ -1298,8 +1299,9 @@ static void *connchild_event(oop_source *lp, int fd, oop_event e, void *u) {
 		     &peer_rd_err, conn);
   if (r) sysdie("oop_rd_read for peer (fd=%d)",conn->fd);
 
-  notice("C%d connected %s", conn->fd, conn->stream ? "streaming" : "plain");
   LIST_ADDHEAD(conns, conn);
+  notice("C%d (now %d) connected %s",
+	 conn->fd, conns.count, conn->stream ? "streaming" : "plain");
 
   connect_attempt_discard();
   check_assign_articles();
@@ -1661,15 +1663,18 @@ static void *conn_write_some_xmits(Conn *conn) {
     assert(rs > 0);
 
     int done;
-    for (done=0; rs && done<conn->xmitu; done++) {
+    for (done=0; rs; ) {
+      assert(done<conn->xmitu);
       struct iovec *vp= &conn->xmit[done];
       XmitDetails *dp= &conn->xmitd[done];
-      if (rs > vp->iov_len) {
+      if (rs >= vp->iov_len) {
 	rs -= vp->iov_len;
-	xmit_free(dp);
+	xmit_free(dp); /* vp->iov_len -= vp->iov_len, etc. */
+	done++;
       } else {
 	vp->iov_base= (char*)vp->iov_base + rs;
 	vp->iov_len -= rs;
+	break; /* rs -= rs */
       }
     }
     int newu= conn->xmitu - done;
@@ -1899,9 +1904,10 @@ static void *peer_rd_ok(oop_source *lp, oop_read *oread, oop_rd_event ev,
     if (code!=205 && code!=503) {
       connfail(conn, "peer gave unexpected response to QUIT: %s", sani);
     } else {
-      notice("C%d idle connection closed by us", conn->fd);
-      assert(!conn_busy);
       LIST_REMOVE(conns,conn);
+      notice("C%d (now %d) idle connection closed by us",
+	     conn->fd, conns.count);
+      assert(!conn_busy);
       conn_dispose(conn);
     }
     return OOP_CONTINUE;
@@ -1936,8 +1942,9 @@ static void *peer_rd_ok(oop_source *lp, oop_read *oread, oop_rd_event ev,
     if (conn_busy)
       PEERBADMSG("peer timed us out or stopped accepting articles");
 
-    notice("C%d idle connection closed by peer", conn->fd);
     LIST_REMOVE(conns,conn);
+    notice("C%d (now %d) idle connection closed by peer",
+	   conns.count, conn->fd);
     conn_dispose(conn);
     return OOP_CONTINUE;
 
@@ -3082,10 +3089,10 @@ static void *inndcomm_event(oop_source *lp, int fd, oop_event e, void *u) {
 	    " to site %s in newsfeeds)", feedfile, sitename);
 
       if (flushing_input_file) {
-	SMS(SEPARATED, max_separated_periods, "recovery flush complete");
+	SMS(SEPARATED, max_separated_periods, "flush complete");
       } else {
 	close_defer();
-	SMS(NORMAL, spontaneous_flush_periods, "flush complete");
+	SMS(NORMAL, spontaneous_flush_periods, "recovery flush complete");
       }
       return OOP_CONTINUE;