X-Git-Url: https://git.distorted.org.uk/~mdw/fwd/blobdiff_plain/e82f7154f65062d9ac8b9677862774498b331058..e68b88bf4ad78f86ac74c52adba87d27c59ed121:/chan.c

diff --git a/chan.c b/chan.c
index 55e6a75..ad44891 100644
--- a/chan.c
+++ b/chan.c
@@ -1,10 +1,10 @@
 /* -*-c-*-
  *
- * $Id: chan.c,v 1.1 1999/07/01 08:56:23 mdw Exp $
+ * $Id: chan.c,v 1.4 1999/08/31 17:42:49 mdw Exp $
  *
  * Channel management
  *
- * (c) 1999 Mark Wooding
+ * (c) 1999 Straylight/Edgeware
  */
 
 /*----- Licensing notice --------------------------------------------------* 
@@ -29,8 +29,17 @@
 /*----- Revision history --------------------------------------------------* 
  *
  * $Log: chan.c,v $
- * Revision 1.1  1999/07/01 08:56:23  mdw
- * Initial revision
+ * Revision 1.4  1999/08/31 17:42:49  mdw
+ * Use `sel_force' to avoid a `select' call between reads and writes.
+ *
+ * Revision 1.3  1999/07/27 18:30:53  mdw
+ * Various minor portability fixes.
+ *
+ * Revision 1.2  1999/07/26 23:27:52  mdw
+ * Minor modifications for new design.
+ *
+ * Revision 1.1.1.1  1999/07/01 08:56:23  mdw
+ * Initial revision.
  *
  */
 
@@ -48,10 +57,6 @@
 #include <unistd.h>
 #include <sys/uio.h>
 
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-
 #include <mLib/alloc.h>
 #include <mLib/conn.h>
 #include <mLib/sel.h>
@@ -114,10 +119,8 @@ static void writechan(int fd, unsigned mode, void *vp)
 
   /* --- Close the output end if necessary --- */
 
-  if (c->len == 0 && (c->f & CHANF_CLOSE)) {
-    shutdown(fd, 1);
+  if (c->len == 0 && (c->f & CHANF_CLOSE))
     c->func(c->p);
-  }
   return;
 
   /* --- Force a close if an error occurred --- */
@@ -167,8 +170,10 @@ static void readchan(int fd, unsigned mode, void *vp)
   }
   else if (r == 0)
     goto close;
-  else if (c->len == 0 && !(c->f & CHANF_READY))
+  else if (c->len == 0 && (c->f & CHANF_READY)) {
     sel_addfile(&c->w);
+    sel_force(&c->w);
+  }
   c->len += r;
   if (c->len == CHAN_BUFSZ)
     sel_rmfile(&c->r);
@@ -178,8 +183,10 @@ static void readchan(int fd, unsigned mode, void *vp)
 
 close:
   c->f |= CHANF_CLOSE;
-  if (!c->len)
+  if (!c->len && (c->f & CHANF_READY)) {
     sel_addfile(&c->w);
+    sel_force(&c->w);
+  }
   sel_rmfile(&c->r);
 }
 
@@ -216,8 +223,11 @@ void chan_dest(chan *c, int fd)
   if (c->f & CHANF_READY)
     return;
   sel_initfile(sel, &c->w, fd, SEL_WRITE, writechan, c);
-  if (c->len)
+  if (c->len || (c->f & CHANF_CLOSE)) {
     sel_addfile(&c->w);
+    sel_force(&c->w);
+  }
+  c->f |= CHANF_READY;
 }
 
 /* --- @chan_open@ --- *