Split packet preparation from sending.

diff --git a/src/meshlink.c b/src/meshlink.c
index e1cf7979631e0f94b9ebf3f8f820afeb5a66197d..c405b1a45732926835c0a3c267cca730b6eb38c6 100644 (file)
--- a/src/meshlink.c
+++ b/src/meshlink.c
@@ -1954,22 +1954,12 @@ void meshlink_set_error_cb(struct meshlink_handle *mesh, meshlink_error_cb_t cb)
        pthread_mutex_unlock(&mesh->mutex);
 }
 
-bool meshlink_send(meshlink_handle_t *mesh, meshlink_node_t *destination, const void *data, size_t len) {
+static vpn_packet_t *prepare_packet(meshlink_handle_t *mesh, meshlink_node_t *destination, const void *data, size_t len) {
        meshlink_packethdr_t *hdr;
 
-       // Validate arguments
-       if(!mesh || !destination || len >= MAXSIZE - sizeof(*hdr)) {
-               meshlink_errno = MESHLINK_EINVAL;
-               return false;
-       }
-
-       if(!len) {
-               return true;
-       }
-
-       if(!data) {
+       if(len >= MAXSIZE - sizeof(*hdr)) {
                meshlink_errno = MESHLINK_EINVAL;
-               return false;
+               return NULL;
        }
 
        node_t *n = (node_t *)destination;
@@ -1977,7 +1967,7 @@ bool meshlink_send(meshlink_handle_t *mesh, meshlink_node_t *destination, const
        if(n->status.blacklisted) {
                logger(mesh, MESHLINK_ERROR, "Node %s blacklisted, dropping packet\n", n->name);
                meshlink_errno = MESHLINK_EBLACKLISTED;
-               return false;
+               return NULL;
        }
 
        // Prepare the packet
@@ -1985,7 +1975,7 @@ bool meshlink_send(meshlink_handle_t *mesh, meshlink_node_t *destination, const
 
        if(!packet) {
                meshlink_errno = MESHLINK_ENOMEM;
-               return false;
+               return NULL;
        }
 
        packet->probe = false;
@@ -2001,6 +1991,32 @@ bool meshlink_send(meshlink_handle_t *mesh, meshlink_node_t *destination, const
 
        memcpy(packet->data + sizeof(*hdr), data, len);
 
+       return packet;
+}
+
+bool meshlink_send(meshlink_handle_t *mesh, meshlink_node_t *destination, const void *data, size_t len) {
+       // Validate arguments
+       if(!mesh || !destination) {
+               meshlink_errno = MESHLINK_EINVAL;
+               return false;
+       }
+
+       if(!len) {
+               return true;
+       }
+
+       if(!data) {
+               meshlink_errno = MESHLINK_EINVAL;
+               return false;
+       }
+
+       // Prepare the packet
+       vpn_packet_t *packet = prepare_packet(mesh, destination, data, len);
+
+       if(!packet) {
+               return false;
+       }
+
        // Queue it
        if(!meshlink_queue_push(&mesh->outpacketqueue, packet)) {
                free(packet);