2nd approach again: class meshlink::mesh has the handle as member, not as base class.

[meshlink] / src / meshlink.c

diff --git a/src/meshlink.c b/src/meshlink.c
index 8266633269845631160fbf9ee5641d46e1f7bd5f..df695b15fa9855a6c5ab9bbee668b39b56cb0fc6 100644 (file)
--- a/src/meshlink.c
+++ b/src/meshlink.c
@@ -758,11 +758,6 @@ static bool meshlink_setup(meshlink_handle_t *mesh) {
 }
 
 meshlink_handle_t *meshlink_open(const char *confbase, const char *name, const char* appname, dev_class_t devclass) {
-       return meshlink_open_with_size(confbase, name, appname, devclass, sizeof(meshlink_handle_t));
-}
-
-meshlink_handle_t *meshlink_open_with_size(const char *confbase, const char *name, const char* appname, dev_class_t devclass, size_t size) {
-
        // Validate arguments provided by the application
        bool usingname = false;
        
@@ -799,7 +794,7 @@ meshlink_handle_t *meshlink_open_with_size(const char *confbase, const char *nam
                return NULL;
        }
 
-       meshlink_handle_t *mesh = xzalloc(size);
+       meshlink_handle_t *mesh = xzalloc(sizeof(meshlink_handle_t));
        mesh->confbase = xstrdup(confbase);
        mesh->appname = xstrdup(appname);
        mesh->devclass = devclass;
@@ -1825,6 +1820,10 @@ void meshlink_whitelist(meshlink_handle_t *mesh, meshlink_node_t *node) {
        return;
 }
 
+void meshlink_set_default_blacklist(meshlink_handle_t *mesh, bool blacklist) {
+       mesh->default_blacklist = blacklist;
+}
+
 /* Hint that a hostname may be found at an address
  * See header file for detailed comment.
  */
@@ -1964,6 +1963,11 @@ static ssize_t channel_send(struct utcp *utcp, const void *data, size_t len) {
 }
 
 void meshlink_set_channel_receive_cb(meshlink_handle_t *mesh, meshlink_channel_t *channel, meshlink_channel_receive_cb_t cb) {
+       if(!mesh || !channel) {
+               meshlink_errno = MESHLINK_EINVAL;
+               return;
+       }
+
        channel->receive_cb = cb;
 }
 
@@ -1993,6 +1997,11 @@ void meshlink_set_channel_poll_cb(meshlink_handle_t *mesh, meshlink_channel_t *c
 }
 
 void meshlink_set_channel_accept_cb(meshlink_handle_t *mesh, meshlink_channel_accept_cb_t cb) {
+       if(!mesh) {
+               meshlink_errno = MESHLINK_EINVAL;
+               return;
+       }
+
        pthread_mutex_lock(&mesh->mesh_mutex);
        mesh->channel_accept_cb = cb;
        mesh->receive_cb = channel_receive;
@@ -2005,10 +2014,12 @@ void meshlink_set_channel_accept_cb(meshlink_handle_t *mesh, meshlink_channel_ac
        pthread_mutex_unlock(&mesh->mesh_mutex);
 }
 
-void meshlink_channel_init(meshlink_handle_t *mesh) {
-}
-
 meshlink_channel_t *meshlink_channel_open(meshlink_handle_t *mesh, meshlink_node_t *node, uint16_t port, meshlink_channel_receive_cb_t cb, const void *data, size_t len) {
+       if(!mesh || !node) {
+               meshlink_errno = MESHLINK_EINVAL;
+               return NULL;
+       }
+
        logger(mesh, MESHLINK_WARNING, "meshlink_channel_open(%p, %s, %u, %p, %p, %zu)\n", mesh, node->name, port, cb, data, len);
        node_t *n = (node_t *)node;
        if(!n->utcp) {
@@ -2032,20 +2043,50 @@ meshlink_channel_t *meshlink_channel_open(meshlink_handle_t *mesh, meshlink_node
 }
 
 void meshlink_channel_shutdown(meshlink_handle_t *mesh, meshlink_channel_t *channel, int direction) {
+       if(!mesh || !channel) {
+               meshlink_errno = MESHLINK_EINVAL;
+               return;
+       }
+
        utcp_shutdown(channel->c, direction);
 }
 
 void meshlink_channel_close(meshlink_handle_t *mesh, meshlink_channel_t *channel) {
+       if(!mesh || !channel) {
+               meshlink_errno = MESHLINK_EINVAL;
+               return;
+       }
+
        utcp_close(channel->c);
        free(channel);
 }
 
 ssize_t meshlink_channel_send(meshlink_handle_t *mesh, meshlink_channel_t *channel, const void *data, size_t len) {
-       // TODO: locking.
+       if(!mesh || !channel) {
+               meshlink_errno = MESHLINK_EINVAL;
+               return -1;
+       }
+
+       if(!len)
+               return 0;
+
+       if(!data) {
+               meshlink_errno = MESHLINK_EINVAL;
+               return -1;
+       }
+
+       // TODO: more finegrained locking.
        // Ideally we want to put the data into the UTCP connection's send buffer.
        // Then, preferrably only if there is room in the receiver window,
        // kick the meshlink thread to go send packets.
-       return utcp_send(channel->c, data, len);
+
+       pthread_mutex_lock(&mesh->mesh_mutex);
+       ssize_t retval = utcp_send(channel->c, data, len);
+       pthread_mutex_unlock(&mesh->mesh_mutex);
+
+       if(retval < 0)
+               meshlink_errno = MESHLINK_ENETWORK;
+       return retval;
 }
 
 void update_node_status(meshlink_handle_t *mesh, node_t *n) {