Various: Report errors encountered while doing channel I/O.

[fwd] / socket.c

diff --git a/socket.c b/socket.c
index 518117c8124d1857d60e34fe8171bcc9c0b2e51b..a1a9a55026b6475f1a95045f374c200c5a19f1c8 100644 (file)
--- a/socket.c
+++ b/socket.c
@@ -225,7 +225,7 @@ void starget_connected(int fd, void *p)
     e->e.in = e->e.out = r;
     e->e.f &= ~EPF_PENDING;
     if (e->e.other)
-      endpt_join(&e->e, e->e.other);
+      endpt_join(&e->e, e->e.other, 0);
   }
 }
 
@@ -454,7 +454,7 @@ static void ss_accept(int fd, unsigned mode, void *p)
 
     /* --- Let everything else happen --- */
 
-    endpt_join(&e->e, ee);
+    endpt_join(&e->e, ee, ss->s.desc);
   }
 }