From 654b1940705197f22ffeebd73e62cea2282bdbda Mon Sep 17 00:00:00 2001 From: "Luke T. Shumaker" Date: Sun, 23 Feb 2025 09:24:31 -0700 Subject: Pull iovec definitions out into libhw/generic/io.h --- libhw_generic/include/libhw/generic/net.h | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'libhw_generic/include/libhw/generic/net.h') diff --git a/libhw_generic/include/libhw/generic/net.h b/libhw_generic/include/libhw/generic/net.h index 8d81573..0386e12 100644 --- a/libhw_generic/include/libhw/generic/net.h +++ b/libhw_generic/include/libhw/generic/net.h @@ -13,16 +13,8 @@ #include /* for uint{n}_t} */ #include /* for ssize_t */ -#if __unix__ -#include -#else -struct iovec { - void *iov_base; - size_t iov_len; -}; -#endif - #include +#include /* Errnos *********************************************************************/ -- cgit v1.2.3-2-g168b From 467c9e2bdbe1192635c786b4ae2120e2ffc7fb63 Mon Sep 17 00:00:00 2001 From: "Luke T. Shumaker" Date: Sun, 23 Feb 2025 09:24:31 -0700 Subject: libhw/generic/net.h: Tidy up the interfaces --- libhw_generic/include/libhw/generic/net.h | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-) (limited to 'libhw_generic/include/libhw/generic/net.h') diff --git a/libhw_generic/include/libhw/generic/net.h b/libhw_generic/include/libhw/generic/net.h index 0386e12..d70034e 100644 --- a/libhw_generic/include/libhw/generic/net.h +++ b/libhw_generic/include/libhw/generic/net.h @@ -13,7 +13,6 @@ #include /* for uint{n}_t} */ #include /* for ssize_t */ -#include #include /* Errnos *********************************************************************/ @@ -69,13 +68,13 @@ lo_interface net_stream_conn; /** \ * The net_stream_conn returned from accept() may still be \ * valid after the listener is closed. \ - * \ - * Return 0 on success, -errno on error. \ */ \ - LO_FUNC(int, close) + LO_NEST(io_closer) LO_INTERFACE(net_stream_listener) #define net_stream_conn_LO_IFACE \ + LO_NEST(io_bidi_closer) \ + \ /** \ * Return bytes-read on success, 0 on EOF, -errno on error; a \ * short read is *not* an error. \ @@ -103,12 +102,7 @@ LO_INTERFACE(net_stream_listener) * expensive to implement), so if you have concurrent writers then you \ * should arrange for a mutex to protect the connection. \ */ \ - LO_FUNC(ssize_t, write, void *buf, size_t count) \ - \ - /** \ - * Return 0 on success, -errno on error. \ - */ \ - LO_FUNC(int, close, bool rd, bool wr) + LO_FUNC(ssize_t, write, void *buf, size_t count) LO_INTERFACE(net_stream_conn) /* Packets (e.g. UDP) *********************************************************/ @@ -117,7 +111,7 @@ LO_INTERFACE(net_stream_conn) LO_FUNC(ssize_t, sendto, \ void *buf, size_t len, \ struct net_ip4_addr node, uint16_t port) \ - \ + \ /** \ * @return The full length of the message, which may be more \ * than the given `len` (as if the Linux MSG_TRUNC flag were \ @@ -126,11 +120,11 @@ LO_INTERFACE(net_stream_conn) LO_FUNC(ssize_t, recvfrom, \ void *buf, size_t len, \ struct net_ip4_addr *ret_node, uint16_t *ret_port) \ - \ - LO_FUNC(void, set_read_deadline, \ + \ + LO_FUNC(void, set_recv_deadline, \ uint64_t ns_since_boot) \ - \ - LO_FUNC(int, close) + \ + LO_NEST(io_closer) LO_INTERFACE(net_packet_conn) /* Interfaces *****************************************************************/ @@ -145,7 +139,7 @@ struct net_iface_config { LO_FUNC(struct net_eth_addr , hwaddr ) \ LO_FUNC(void , ifup , struct net_iface_config) \ LO_FUNC(void , ifdown ) \ - \ + \ LO_FUNC(lo_interface net_stream_listener, tcp_listen, uint16_t local_port) \ LO_FUNC(lo_interface net_stream_conn , tcp_dial , struct net_ip4_addr remote_node, uint16_t remote_port) \ LO_FUNC(lo_interface net_packet_conn , udp_conn , uint16_t local_port) -- cgit v1.2.3-2-g168b From 98a06a9452c2a48076487e3b84e877cde83e89b8 Mon Sep 17 00:00:00 2001 From: "Luke T. Shumaker" Date: Sun, 23 Feb 2025 09:24:31 -0700 Subject: libhw/generic/io.h: Add reader/writer interfaces to enforce iovecs everywhere --- libhw_generic/include/libhw/generic/net.h | 92 +++++++++++++++---------------- 1 file changed, 44 insertions(+), 48 deletions(-) (limited to 'libhw_generic/include/libhw/generic/net.h') diff --git a/libhw_generic/include/libhw/generic/net.h b/libhw_generic/include/libhw/generic/net.h index d70034e..e88d705 100644 --- a/libhw_generic/include/libhw/generic/net.h +++ b/libhw_generic/include/libhw/generic/net.h @@ -72,58 +72,54 @@ lo_interface net_stream_conn; LO_NEST(io_closer) LO_INTERFACE(net_stream_listener) -#define net_stream_conn_LO_IFACE \ - LO_NEST(io_bidi_closer) \ - \ - /** \ - * Return bytes-read on success, 0 on EOF, -errno on error; a \ - * short read is *not* an error. \ - */ \ - LO_FUNC(ssize_t, read, void *buf, size_t count) \ - \ - /** \ - * Set a timestamp after which calls to read() will return \ - * NET_ETIMEDOUT. The timestamp is in nanoseconds on the \ - * system monotonic clock, which is usually (on pico-sdk and \ - * on the Linux kernel) nanoseconds-since-boot. \ - * \ - * A zero value disables the deadline. \ - * \ - * (2⁶⁴-1 nanoseconds is more than 500 years; there is little \ - * risk of this overflowing) \ - */ \ - LO_FUNC(void, set_read_deadline, uint64_t ns_since_boot) \ - \ - /** \ - * Return `count` on success, -errno on error; a short write *is* an \ - * error. \ - * \ - * Writes are *not* guaranteed to be atomic (as this would be \ - * expensive to implement), so if you have concurrent writers then you \ - * should arrange for a mutex to protect the connection. \ - */ \ - LO_FUNC(ssize_t, write, void *buf, size_t count) +#define net_stream_conn_LO_IFACE \ + LO_NEST(io_readwriter) \ + LO_NEST(io_bidi_closer) \ + \ + /** \ + * Set a timestamp after which calls to read() will return \ + * NET_ETIMEDOUT. The timestamp is in nanoseconds on the \ + * system monotonic clock, which is usually (on pico-sdk and \ + * on the Linux kernel) nanoseconds-since-boot. \ + * \ + * A zero value disables the deadline. \ + * \ + * (2⁶⁴-1 nanoseconds is more than 500 years; there is little \ + * risk of this overflowing) \ + */ \ + LO_FUNC(void, set_read_deadline, uint64_t ns_since_boot) LO_INTERFACE(net_stream_conn) /* Packets (e.g. UDP) *********************************************************/ -#define net_packet_conn_LO_IFACE \ - LO_FUNC(ssize_t, sendto, \ - void *buf, size_t len, \ - struct net_ip4_addr node, uint16_t port) \ - \ - /** \ - * @return The full length of the message, which may be more \ - * than the given `len` (as if the Linux MSG_TRUNC flag were \ - * given). \ - */ \ - LO_FUNC(ssize_t, recvfrom, \ - void *buf, size_t len, \ - struct net_ip4_addr *ret_node, uint16_t *ret_port) \ - \ - LO_FUNC(void, set_recv_deadline, \ - uint64_t ns_since_boot) \ - \ +#define net_packet_conn_LO_IFACE \ + LO_FUNC(ssize_t, sendto, \ + void *buf, size_t len, \ + struct net_ip4_addr node, uint16_t port) \ + \ + /** \ + * @return The full length of the message, which may be more \ + * than the given `len` (as if the Linux MSG_TRUNC flag were \ + * given). \ + */ \ + LO_FUNC(ssize_t, recvfrom, \ + void *buf, size_t len, \ + struct net_ip4_addr *ret_node, uint16_t *ret_port) \ + \ + /** \ + * Set a timestamp after which calls to recvfrom() will return \ + * NET_ETIMEDOUT. The timestamp is in nanoseconds on the \ + * system monotonic clock, which is usually (on pico-sdk and \ + * on the Linux kernel) nanoseconds-since-boot. \ + * \ + * A zero value disables the deadline. \ + * \ + * (2⁶⁴-1 nanoseconds is more than 500 years; there is little \ + * risk of this overflowing) \ + */ \ + LO_FUNC(void, set_recv_deadline, \ + uint64_t ns_since_boot) \ + \ LO_NEST(io_closer) LO_INTERFACE(net_packet_conn) -- cgit v1.2.3-2-g168b