Fix free_connection() moving the wrong memory.

[utcp] / utcp.h

diff --git a/utcp.h b/utcp.h
index b189a24be1bd3dfd194052a45b078de12e01c4a0..53a107fd13a20196ce7485b93a754771d2a36b62 100644 (file)
--- a/utcp.h
+++ b/utcp.h
@@ -41,22 +41,46 @@ struct utcp_connection;
 typedef bool (*utcp_pre_accept_t)(struct utcp *utcp, uint16_t port);
 typedef void (*utcp_accept_t)(struct utcp_connection *utcp_connection, uint16_t port);
 
-typedef int (*utcp_send_t)(struct utcp *utcp, const void *data, size_t len);
-typedef int (*utcp_recv_t)(struct utcp_connection *connection, const void *data, size_t len);
+typedef ssize_t (*utcp_send_t)(struct utcp *utcp, const void *data, size_t len);
+typedef ssize_t (*utcp_recv_t)(struct utcp_connection *connection, const void *data, size_t len);
+
+typedef void (*utcp_poll_t)(struct utcp_connection *connection, size_t len);
 
 extern struct utcp *utcp_init(utcp_accept_t accept, utcp_pre_accept_t pre_accept, utcp_send_t send, void *priv);
 extern void utcp_exit(struct utcp *utcp);
 
-extern void utcp_set_mtu(struct utcp *utcp, uint16_t mtu);
-
 extern struct utcp_connection *utcp_connect(struct utcp *utcp, uint16_t port, utcp_recv_t recv, void *priv);
 extern void utcp_accept(struct utcp_connection *utcp, utcp_recv_t recv, void *priv);
 extern ssize_t utcp_send(struct utcp_connection *connection, const void *data, size_t len);
-extern int utcp_recv(struct utcp *utcp, const void *data, size_t len);
+extern ssize_t utcp_recv(struct utcp *utcp, const void *data, size_t len);
 extern int utcp_close(struct utcp_connection *connection);
 extern int utcp_abort(struct utcp_connection *connection);
 extern int utcp_shutdown(struct utcp_connection *connection, int how);
 extern int utcp_timeout(struct utcp *utcp);
-extern int utcp_set_connection_timeout(struct utcp *utcp, int seconds);
+extern void utcp_set_recv_cb(struct utcp_connection *connection, utcp_recv_t recv);
+extern void utcp_set_poll_cb(struct utcp_connection *connection, utcp_poll_t poll);
+
+// Global socket options
+
+extern int utcp_get_user_timeout(struct utcp *utcp);
+extern void utcp_set_user_timeout(struct utcp *utcp, int seconds);
+
+extern uint16_t utcp_get_mtu(struct utcp *utcp);
+extern void utcp_set_mtu(struct utcp *utcp, uint16_t mtu);
+
+// Per-socket options
+
+extern size_t utcp_get_sndbuf(struct utcp_connection *connection);
+extern void utcp_set_sndbuf(struct utcp_connection *connection, size_t size);
+
+extern size_t utcp_get_sndbuf_free(struct utcp_connection *connection);
+
+extern bool utcp_get_nodelay(struct utcp_connection *connection);
+extern void utcp_set_nodelay(struct utcp_connection *connection, bool nodelay);
+
+extern bool utcp_get_keepalive(struct utcp_connection *connection);
+extern void utcp_set_keepalive(struct utcp_connection *connection, bool keepalive);
+
+extern size_t utcp_get_outq(struct utcp_connection *connection);
 
 #endif