From: Ian Jackson <ian@liberator.relativity.greenend.org.uk>
Date: Thu, 29 Apr 2010 01:08:33 +0000 (+0100)
Subject: fixes
X-Git-Tag: innduct-0.1~101
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=innduct.git;a=commitdiff_plain;h=31d0604e13e16afb3f0da8f8cfeb7282a702f154

fixes
---

diff --git a/backends/innduct.c b/backends/innduct.c
index 46d88bc..bc954f4 100644
--- a/backends/innduct.c
+++ b/backends/innduct.c
@@ -190,6 +190,7 @@ perl -ne 'print if m/-8\<-/..m/-\>8-/; print "\f" if m/-\^L-/' backends/innduct.
 #include <glob.h>
 #include <time.h>
 #include <math.h>
+#include <ctype.h>
 
 #include <oop.h>
 #include <oop-read.h>
@@ -244,7 +245,7 @@ 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_INIT(l) (list_new(&(l).u.li))
+#define LIST_INIT(l) ((l).count=0, 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))))
@@ -1135,9 +1136,15 @@ static void connect_attempt_discard(void) {
 }
 
 #define PREP_DECL_MSG_CMSG(msg)			\
+  char msgbyte= 0;				\
+  struct iovec msgiov;				\
+  msgiov.iov_base= &msgbyte;			\
+  msgiov.iov_len= 1;				\
   struct msghdr msg;				\
   memset(&msg,0,sizeof(msg));			\
-  char msg##cbuf[CMSG_SPACE(sizeof(fd))];	\
+  char msg##cbuf[CMSG_SPACE(sizeof(int))];	\
+  msg.msg_iov= &msgiov;				\
+  msg.msg_iovlen= 1;				\
   msg.msg_control= msg##cbuf;			\
   msg.msg_controllen= sizeof(msg##cbuf);
 
@@ -1145,7 +1152,9 @@ static void *connchild_event(oop_source *lp, int fd, oop_event e, void *u) {
   Conn *conn= 0;
 
   assert(fd == connecting_fdpass_sock);
+
   PREP_DECL_MSG_CMSG(msg);
+  
   ssize_t rs= recvmsg(fd, &msg, 0);
   if (rs<0) {
     if (isewouldblock(errno)) return OOP_CONTINUE;
@@ -1155,6 +1164,9 @@ static void *connchild_event(oop_source *lp, int fd, oop_event e, void *u) {
 
   conn= xmalloc(sizeof(*conn));
   memset(conn,0,sizeof(*conn));
+  LIST_INIT(conn->waiting);
+  LIST_INIT(conn->priority);
+  LIST_INIT(conn->sent);
 
   struct cmsghdr *h= 0;
   if (rs >= 0) h= CMSG_FIRSTHDR(&msg);
@@ -1215,9 +1227,6 @@ 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);
   conn->max_queue= conn->stream ? max_queue_per_conn : 1;
 
   loop->on_fd(loop, conn->fd, OOP_EXCEPTION, conn_exception, conn);
@@ -1251,7 +1260,7 @@ static void connect_start(void) {
   assert(!connecting_child);
   assert(!connecting_fdpass_sock);
 
-  notice("starting connection attempt");
+  info("starting connection attempt");
 
   int socks[2];
   int r= socketpair(AF_UNIX, SOCK_STREAM, 0, socks);
@@ -1287,7 +1296,7 @@ static void connect_start(void) {
     if (NNTPsendpassword((char*)remote_host, cn_from, cn_to) < 0)
       sysfatal("connect: authentication failed");
     if (try_stream) {
-      if (fputs("MODE STREAM\r\n", cn_to) ||
+      if (fputs("MODE STREAM\r\n", cn_to)==EOF ||
 	  fflush(cn_to))
 	sysfatal("connect: could not send MODE STREAM");
       buf[sizeof(buf)-1]= 0;
@@ -1299,7 +1308,7 @@ static void connect_start(void) {
       }
       int l= strlen(buf);
       assert(l>=1);
-      if (buf[-1]!='\n')
+      if (buf[l-1]!='\n')
 	fatal("connect: response to MODE STREAM is too long: %.100s...",
 	      sanitise(buf));
       l--;  if (l>0 && buf[l-1]=='\r') l--;
@@ -1334,7 +1343,8 @@ static void connect_start(void) {
 
     msg.msg_controllen= cmsg->cmsg_len;
     r= sendmsg(socks[1], &msg, 0);
-    if (r) sysdie("sendmsg failed for new connection");
+    if (r<0) sysdie("sendmsg failed for new connection");
+    if (r!=1) die("sendmsg for new connection gave wrong result %d",r);
 
     _exit(exitstatus);
   }
@@ -1375,6 +1385,7 @@ static void check_assign_articles(void) {
       if (!inqueue) use->since_activity= 0; /* reset idle counter */
       while (spare>0) {
 	Article *art= LIST_REMHEAD(queue);
+	if (!art) break;
 	LIST_ADDTAIL(use->waiting, art);
 	spare--;
       }