3 files changed, 39 insertions, 17 deletions
diff --git a/libhw/host_net.c b/libhw/host_net.c
index eee293e..f977739 100644
--- a/libhw/host_net.c
+++ b/libhw/host_net.c
@@ -30,8 +30,14 @@
 
 #include "host_util.h" /* for host_sigrt_alloc(), ns_to_host_us_time() */
 
-LO_IMPLEMENTATION_C(net_stream_conn, struct _hostnet_tcp_conn, hostnet_tcp, static)
+LO_IMPLEMENTATION_C(io_closer, struct hostnet_tcp_listener, hostnet_tcplist, static)
 LO_IMPLEMENTATION_C(net_stream_listener, struct hostnet_tcp_listener, hostnet_tcplist, static)
+
+LO_IMPLEMENTATION_C(io_closer, struct _hostnet_tcp_conn, hostnet_tcp, static)
+LO_IMPLEMENTATION_C(io_bidi_closer, struct _hostnet_tcp_conn, hostnet_tcp, static)
+LO_IMPLEMENTATION_C(net_stream_conn, struct _hostnet_tcp_conn, hostnet_tcp, static)
+
+LO_IMPLEMENTATION_C(io_closer, struct hostnet_udp_conn, hostnet_udp, static)
 LO_IMPLEMENTATION_C(net_packet_conn, struct hostnet_udp_conn, hostnet_udp, static)
 
 /* common *********************************************************************/
@@ -312,19 +318,17 @@ static ssize_t hostnet_tcp_write(struct _hostnet_tcp_conn *conn, void *buf, size
 
 /* TCP close() ****************************************************************/
 
-static int hostnet_tcp_close(struct _hostnet_tcp_conn *conn, bool rd, bool wr) {
+static int hostnet_tcp_close(struct _hostnet_tcp_conn *conn) {
 	assert(conn);
-
-	int how;
-	if (rd && wr)
-		how = SHUT_RDWR;
-	else if (rd && !wr)
-		how = SHUT_RD;
-	else if (!rd && wr)
-		how = SHUT_WR;
-	else
-		assert_notreached("invalid arguments to stream_conn.close()");
-	return hostnet_map_negerrno(shutdown(conn->fd, how) ? -errno : 0, OP_NONE);
+	return hostnet_map_negerrno(shutdown(conn->fd, SHUT_RDWR) ? -errno : 0, OP_NONE);
+}
+static int hostnet_tcp_close_read(struct _hostnet_tcp_conn *conn) {
+	assert(conn);
+	return hostnet_map_negerrno(shutdown(conn->fd, SHUT_RD) ? -errno : 0, OP_NONE);
+}
+static int hostnet_tcp_close_write(struct _hostnet_tcp_conn *conn) {
+	assert(conn);
+	return hostnet_map_negerrno(shutdown(conn->fd, SHUT_WR) ? -errno : 0, OP_NONE);
 }
 
 /* UDP init() *****************************************************************/
@@ -412,7 +416,7 @@ static ssize_t hostnet_udp_sendto(struct hostnet_udp_conn *conn, void *buf, size
 
 /* UDP recvfrom() *************************************************************/
 
-static void hostnet_udp_set_read_deadline(struct hostnet_udp_conn *conn,
+static void hostnet_udp_set_recv_deadline(struct hostnet_udp_conn *conn,
                                           uint64_t ts_ns) {
 	assert(conn);
 
diff --git a/libhw/rp2040_include/libhw/w5500.h b/libhw/rp2040_include/libhw/w5500.h
index 98e54ec..a035069 100644
--- a/libhw/rp2040_include/libhw/w5500.h
+++ b/libhw/rp2040_include/libhw/w5500.h
@@ -40,8 +40,15 @@ struct _w5500_socket {
 
 	END_PRIVATE(LIBHW_W5500_H)
 };
+
+LO_IMPLEMENTATION_H(io_closer, struct _w5500_socket, w5500_tcplist)
 LO_IMPLEMENTATION_H(net_stream_listener, struct _w5500_socket, w5500_tcplist)
+
+LO_IMPLEMENTATION_H(io_closer, struct _w5500_socket, w5500_tcp)
+LO_IMPLEMENTATION_H(io_bidi_closer, struct _w5500_socket, w5500_tcp)
 LO_IMPLEMENTATION_H(net_stream_conn, struct _w5500_socket, w5500_tcp)
+
+LO_IMPLEMENTATION_H(io_closer, struct _w5500_socket, w5500_udp)
 LO_IMPLEMENTATION_H(net_packet_conn, struct _w5500_socket, w5500_udp)
 
 struct w5500 {
diff --git a/libhw/w5500.c b/libhw/w5500.c
index a8777db..cd96696 100644
--- a/libhw/w5500.c
+++ b/libhw/w5500.c
@@ -125,9 +125,16 @@ static const char *w5500_state_str(uint8_t state) {
 
 /* libobj *********************************************************************/
 
+LO_IMPLEMENTATION_C(io_closer, struct _w5500_socket, w5500_tcplist, static)
 LO_IMPLEMENTATION_C(net_stream_listener, struct _w5500_socket, w5500_tcplist, static)
+
+LO_IMPLEMENTATION_C(io_closer, struct _w5500_socket, w5500_tcp, static)
+LO_IMPLEMENTATION_C(io_bidi_closer, struct _w5500_socket, w5500_tcp, static)
 LO_IMPLEMENTATION_C(net_stream_conn, struct _w5500_socket, w5500_tcp, static)
+
+LO_IMPLEMENTATION_C(io_closer, struct _w5500_socket, w5500_udp, static)
 LO_IMPLEMENTATION_C(net_packet_conn, struct _w5500_socket, w5500_udp, static)
+
 LO_IMPLEMENTATION_C(net_iface, struct w5500, w5500_if, static)
 
 /* mid-level utilities ********************************************************/
@@ -746,7 +753,7 @@ static ssize_t w5500_tcp_read(struct _w5500_socket *socket, void *buf, size_t co
 	return avail;
 }
 
-static int w5500_tcp_close(struct _w5500_socket *socket, bool rd, bool wr) {
+static int w5500_tcp_close_inner(struct _w5500_socket *socket, bool rd, bool wr) {
 	debugf("tcp_conn.close(rd=%s, wr=%s)", rd ? "true" : "false", wr ? "true" : "false");
 	ASSERT_SELF(stream_conn, TCP);
 
@@ -777,6 +784,10 @@ static int w5500_tcp_close(struct _w5500_socket *socket, bool rd, bool wr) {
 	return 0;
 }
 
+static int w5500_tcp_close(struct _w5500_socket *socket) { return w5500_tcp_close_inner(socket, true, true); }
+static int w5500_tcp_close_read(struct _w5500_socket *socket) { return w5500_tcp_close_inner(socket, true, false); }
+static int w5500_tcp_close_write(struct _w5500_socket *socket) { return w5500_tcp_close_inner(socket, false, true); }
+
 /* udp_conn methods ***********************************************************/
 
 static ssize_t w5500_udp_sendto(struct _w5500_socket *socket, void *buf, size_t count,
@@ -836,8 +847,8 @@ static ssize_t w5500_udp_sendto(struct _w5500_socket *socket, void *buf, size_t
 	}
 }
 
-static void w5500_udp_set_read_deadline(struct _w5500_socket *socket, uint64_t ns) {
-	debugf("udp_conn.set_read_deadline(%"PRIu64")", ns);
+static void w5500_udp_set_recv_deadline(struct _w5500_socket *socket, uint64_t ns) {
+	debugf("udp_conn.set_recv_deadline(%"PRIu64")", ns);
 	ASSERT_SELF(packet_conn, UDP);
 	socket->read_deadline_ns = ns;
 }