Merge pull request #296 from kubo39/fd-in-net

Add fd() method for TCPConnection/UDPConnection
vibe-d · Sep 25, 2021 · 12f7ddc · 12f7ddc
2 parents 49643ec + 384f625
commit 12f7ddc
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/source/vibe/core/net.d b/source/vibe/core/net.d
@@ -527,6 +527,8 @@ struct TCPConnection {
 			releaseHandle!"sockets"(m_socket, m_context.driver);
 	}
 
+	@property int fd() const nothrow { return cast(int)m_socket; }
+
 	bool opCast(T)() const nothrow if (is(T == bool)) { return m_socket != StreamSocketFD.invalid; }
 
 	@property void tcpNoDelay(bool enabled) nothrow { eventDriver.sockets.setTCPNoDelay(m_socket, enabled); m_context.tcpNoDelay = enabled; }
@@ -971,6 +973,8 @@ struct UDPConnection {
 			releaseHandle!"sockets"(m_socket, m_context.driver);
 	}
 
+	@property int fd() const nothrow { return cast(int)m_socket; }
+
 	bool opCast(T)() const nothrow if (is(T == bool)) { return m_socket != DatagramSocketFD.invalid; }
 
 	/** Returns the address to which the UDP socket is bound.

diff --git a/tests/0-tcp.d b/tests/0-tcp.d
@@ -6,6 +6,7 @@
 +/
 module tests;
 
+import eventcore.core;
 import vibe.core.core;
 import vibe.core.log;
 import vibe.core.net;
@@ -29,6 +30,7 @@ void test1()
 		lt = Task.getThis();
 		try {
 			while (!conn.empty) {
+				assert(conn.fd() != StreamSocketFD.invalid);
 				assert(conn.readLine() == "next");
 				auto curtest = test;
 				conn.write("continue\n");