X-Git-Url: https://git.distorted.org.uk/~mdw/disorder/blobdiff_plain/295e0ff936937ae1b860c7e7271f63a670df25a3..38b8221fb0125d2c668611f75a9e03cf8ccc54f5:/server/server.c

diff --git a/server/server.c b/server/server.c
index 35f352d..6bfee6b 100644
--- a/server/server.c
+++ b/server/server.c
@@ -96,7 +96,6 @@ struct conn {
 
 static int reader_callback(ev_source *ev,
 			   ev_reader *reader,
-			   int fd,
 			   void *ptr,
 			   size_t bytes,
 			   int eof,
@@ -105,47 +104,43 @@ static int reader_callback(ev_source *ev,
 static const char *noyes[] = { "no", "yes" };
 
 static int writer_error(ev_source attribute((unused)) *ev,
-			int fd,
 			int errno_value,
 			void *u) {
   struct conn *c = u;
 
-  D(("server writer_error %d %d", fd, errno_value));
+  D(("server writer_error %d", errno_value));
+  info("writer_error S%x %d", c->tag, errno_value);
   if(errno_value == 0) {
     /* writer is done */
-    c->w = 0;
-    if(c->r == 0) {
-      //D(("server writer_error closes %d", fd));
-      info("server writer_error closes %d because all done", fd); /* TODO */
-      xclose(fd);		/* reader is done too, close */
-    } else {
-      //D(("server writer_error shutdown %d SHUT_WR", fd));
-      info("server writer_error shutdown %d SHUT_WR", fd); /* TODO */
-      xshutdown(fd, SHUT_WR);	/* reader is not done yet */
-    }
+    error(errno_value, "S%x writer completed", c->tag);	/* TODO */
   } else {
     if(errno_value != EPIPE)
       error(errno_value, "S%x write error on socket", c->tag);
-    if(c->r)
+    if(c->r) {
+      info("cancel reader");
       ev_reader_cancel(c->r);
-    info("server writer_error closes %d because errno=%d", fd, errno_value); /* TODO */
-    xclose(fd);
+      c->r = 0;
+    }
+    info("done cancel reader");
   }
+  c->w = 0;
+  ev_report(ev);
   return 0;
 }
 
 static int reader_error(ev_source attribute((unused)) *ev,
-			int fd,
 			int errno_value,
 			void *u) {
   struct conn *c = u;
 
-  D(("server reader_error %d %d", fd, errno_value));
-  error(errno, "S%x read error on socket", c->tag);
-  ev_writer_cancel(c->w);
+  D(("server reader_error %d", errno_value));
+  info("reader_error S%x %d", c->tag, errno_value);
+  error(errno_value, "S%x read error on socket", c->tag);
+  if(c->w)
+    ev_writer_close(c->w);
+  c->w = 0;
+  c->r = 0;
   ev_report(ev);
-  info("reader_error closing fd %d", fd); /* TODO */
-  xclose(fd);
   return 0;
 }
 
@@ -723,7 +718,6 @@ static int c_volume(struct conn *c,
 /* we are logging, and some data is available to read */
 static int logging_reader_callback(ev_source *ev,
 				   ev_reader *reader,
-				   int fd,
 				   void *ptr,
 				   size_t bytes,
 				   int eof,
@@ -732,17 +726,25 @@ static int logging_reader_callback(ev_source *ev,
 
   /* don't log to this conn any more */
   eventlog_remove(c->lo);
-  /* terminate the log output */
-  sink_writes(ev_writer_sink(c->w), ".\n");
+  if(c->w) {
+    /* Terminate the log output, but only if the writer hasn't been killed off
+     * from a failure on some earlier write */
+    sink_writes(ev_writer_sink(c->w), ".\n");
+  }
   /* restore the reader callback */
   c->reader = reader_callback;
   /* ...and exit via it */
-  return c->reader(ev, reader, fd, ptr, bytes, eof, u);
+  return c->reader(ev, reader, ptr, bytes, eof, u);
 }
 
 static void logclient(const char *msg, void *user) {
   struct conn *c = user;
 
+  if(!c->w || !c->r) {
+    /* This connection has gone up in smoke for some reason */
+    eventlog_remove(c->lo);
+    return;
+  }
   sink_printf(ev_writer_sink(c->w), "%"PRIxMAX" %s\n",
 	      (uintmax_t)time(0), msg);
 }
@@ -1050,20 +1052,18 @@ static int command(struct conn *c, char *line) {
 /* redirect to the right reader callback for our current state */
 static int redirect_reader_callback(ev_source *ev,
 				    ev_reader *reader,
-				    int fd,
 				    void *ptr,
 				    size_t bytes,
 				    int eof,
 				    void *u) {
   struct conn *c = u;
 
-  return c->reader(ev, reader, fd, ptr, bytes, eof, u);
+  return c->reader(ev, reader, ptr, bytes, eof, u);
 }
 
 /* the main command reader */
 static int reader_callback(ev_source attribute((unused)) *ev,
 			   ev_reader *reader,
-			   int attribute((unused)) fd,
 			   void *ptr,
 			   size_t bytes,
 			   int eof,
@@ -1093,7 +1093,6 @@ static int reader_callback(ev_source attribute((unused)) *ev,
   if(eof) {
     if(bytes)
       error(0, "S%x unterminated line", c->tag);
-    c->r = 0;
     return ev_writer_close(c->w);
   }
   return 0;
@@ -1117,6 +1116,7 @@ static int listen_callback(ev_source *ev,
 		       "client writer");
   c->r = ev_reader_new(ev, fd, redirect_reader_callback, reader_error, c,
 		       "client reader");
+  ev_tie(c->r, c->w);
   c->fd = fd;
   c->reader = reader_callback;
   c->l = l;