Merge pull request #157 from armanbilge/pr/fix-shutdown-enotconn

Ignore `ENOTCONN` on socket shutdown
armanbilge · Aug 27, 2023 · fc6f369 · fc6f369
2 parents d8d73b5 + 5a16c12
commit fc6f369
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 2 deletions.
diff --git a/core/src/main/scala/epollcat/internal/ch/EpollAsyncSocketChannel.scala b/core/src/main/scala/epollcat/internal/ch/EpollAsyncSocketChannel.scala
@@ -38,6 +38,7 @@ import scala.scalanative.annotation.stub
 import scala.scalanative.libc.errno
 import scala.scalanative.meta.LinktimeInfo
 import scala.scalanative.posix
+import scala.scalanative.posix.errno._
 import scala.scalanative.posix.netdbOps._
 import scala.scalanative.unsafe._
 import scala.scalanative.unsigned._
@@ -79,14 +80,14 @@ final class EpollAsyncSocketChannel private (
   def isOpen = _isOpen
 
   def shutdownInput(): AsynchronousSocketChannel = {
-    if (posix.sys.socket.shutdown(fd, 0) == -1)
+    if (posix.sys.socket.shutdown(fd, 0) == -1 && errno.errno != ENOTCONN)
       throw new IOException(s"shutdown: ${errno.errno}")
     this
   }
 
   def shutdownOutput(): AsynchronousSocketChannel = {
     outputShutdown = true
-    if (posix.sys.socket.shutdown(fd, 1) == -1)
+    if (posix.sys.socket.shutdown(fd, 1) == -1 && errno.errno != ENOTCONN)
       throw new IOException(s"shutdown: ${errno.errno}")
     this
   }

diff --git a/tests/shared/src/test/scala/epollcat/TcpSuite.scala b/tests/shared/src/test/scala/epollcat/TcpSuite.scala
@@ -362,4 +362,22 @@ class TcpSuite extends EpollcatSuite {
       .flatMap(address => IOServerSocketChannel.open.evalTap(_.bind(address)).use_)
   }
 
+  test("shutdown ignores ENOTCONN") {
+    IOServerSocketChannel
+      .open
+      .evalTap(_.bind(new InetSocketAddress("localhost", 0)))
+      .use { server =>
+        server.localAddress.flatTap { address =>
+          val connect =
+            IOSocketChannel.open.evalTap(_.connect(address)).surround(IO.sleep(100.millis))
+          val accept = server.accept.use { ch =>
+            ch.write(ByteBuffer.wrap("hello".getBytes)) *>
+              IO.sleep(1.second) *> ch.shutdownInput *> ch.shutdownOutput
+          }
+          connect.both(accept).void
+        }
+      }
+      .flatMap(address => IOServerSocketChannel.open.evalTap(_.bind(address)).use_)
+  }
+
 }