Clear send and receive buffers before channel close/error callbacks.

[meshlink] / src / meshlink.c

diff --git a/src/meshlink.c b/src/meshlink.c
index f6b12bd89d0e26e87e796290b3e9305263db573c..4280c4f13797c27919f1790ac5be59ce442a12d8 100644 (file)
--- a/src/meshlink.c
+++ b/src/meshlink.c
@@ -3154,7 +3154,7 @@ bool meshlink_join(meshlink_handle_t *mesh, const char *invitation) {
                }
 
                // Connect to the meshlink daemon mentioned in the URL.
-               struct addrinfo *ai = adns_blocking_request(mesh, xstrdup(address), xstrdup(port), SOCK_STREAM, 5);
+               struct addrinfo *ai = adns_blocking_request(mesh, xstrdup(address), xstrdup(port), SOCK_STREAM, 30);
 
                if(ai) {
                        for(struct addrinfo *aip = ai; aip; aip = aip->ai_next) {
@@ -4252,6 +4252,32 @@ void meshlink_channel_close(meshlink_handle_t *mesh, meshlink_channel_t *channel
        pthread_mutex_unlock(&mesh->mutex);
 }
 
+void meshlink_channel_abort(meshlink_handle_t *mesh, meshlink_channel_t *channel) {
+       if(!mesh || !channel) {
+               meshlink_errno = MESHLINK_EINVAL;
+               return;
+       }
+
+       if(pthread_mutex_lock(&mesh->mutex) != 0) {
+               abort();
+       }
+
+       if(channel->c) {
+               utcp_abort(channel->c);
+               channel->c = NULL;
+
+               /* Clean up any outstanding AIO buffers. */
+               aio_abort(mesh, channel, &channel->aio_send);
+               aio_abort(mesh, channel, &channel->aio_receive);
+       }
+
+       if(!channel->in_callback) {
+               free(channel);
+       }
+
+       pthread_mutex_unlock(&mesh->mutex);
+}
+
 ssize_t meshlink_channel_send(meshlink_handle_t *mesh, meshlink_channel_t *channel, const void *data, size_t len) {
        if(!mesh || !channel) {
                meshlink_errno = MESHLINK_EINVAL;