- (djm) Suppress error messages on channel close shutdown() failurs

   works around Linux bug. Patch from Zack Weinberg <zack@wolery.cumb.org>

2 files changed, 10 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 1c2ac891f..04caaafbc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 20000807
  - (djm) Set 0755 on binaries during install. 
+ - (djm) Suppress error messages on channel close shutdown() failurs
+   works around Linux bug. Patch from Zack Weinberg <zack@wolery.cumb.org>
 
 20000725
  - (djm) Fix autoconf typo: HAVE_BINRESVPORT_AF -> HAVE_BINDRESVPORT_AF
diff --git a/nchan.c b/nchan.c
index cef56497b..51c5a4cad 100644
--- a/nchan.c
+++ b/nchan.c
@@ -483,7 +483,14 @@ chan_shutdown_read(Channel *c)
                 return;
         debug("channel %d: close_read", c->self);
         if (c->sock != -1) {
-                if (shutdown(c->sock, SHUT_RD) < 0)
+                /* 
+                 * shutdown(sock, SHUT_READ) may return ENOTCONN if the
+                 * write side has been closed already. (bug on Linux)
+                 */
+                if (shutdown(c->sock, SHUT_RD) < 0
+                    && (errno != ENOTCONN
+                        || c->ostate == CHAN_OUTPUT_OPEN
+                        || c->ostate == CHAN_OUTPUT_WAIT_DRAIN))
                         error("channel %d: chan_shutdown_read: shutdown() failed for fd%d [i%d o%d]: %.100s",
                             c->self, c->sock, c->istate, c->ostate, strerror(errno));
         } else {