Add support for sendmmsg().

[meshlink] / src / meshlink.c

diff --git a/src/meshlink.c b/src/meshlink.c
index 4e258c5633f1a1e7e2bf1f4982bea39cd81231f6..283a949250a95615d5d7a38bf6cff1686a281a97 100644 (file)
--- a/src/meshlink.c
+++ b/src/meshlink.c
@@ -665,24 +665,28 @@ static bool finalize_join(join_state_t *state, const void *buf, uint16_t len) {
        }
 
        char *name = packmsg_get_str_dup(&in);
-       packmsg_skip_element(&in); /* submesh */
+       char *submesh_name = packmsg_get_str_dup(&in);
        dev_class_t devclass = packmsg_get_int32(&in);
        uint32_t count = packmsg_get_array(&in);
 
-       if(!name) {
-               logger(mesh, MESHLINK_DEBUG, "No Name found in invitation!\n");
+       if(!name || !check_id(name)) {
+               logger(mesh, MESHLINK_DEBUG, "No valid Name found in invitation!\n");
+               free(name);
+               free(submesh_name);
                return false;
        }
 
-       if(!check_id(name)) {
-               logger(mesh, MESHLINK_DEBUG, "Invalid Name found in invitation: %s!\n", name);
+       if(!submesh_name || (strcmp(submesh_name, CORE_MESH) && !check_id(submesh_name))) {
+               logger(mesh, MESHLINK_DEBUG, "No valid Submesh found in invitation!\n");
                free(name);
+               free(submesh_name);
                return false;
        }
 
        if(!count) {
                logger(mesh, MESHLINK_ERROR, "Incomplete invitation file!\n");
                free(name);
+               free(submesh_name);
                return false;
        }
 
@@ -690,6 +694,8 @@ static bool finalize_join(join_state_t *state, const void *buf, uint16_t len) {
        free(mesh->self->name);
        mesh->name = name;
        mesh->self->name = xstrdup(name);
+       mesh->self->submesh = strcmp(submesh_name, CORE_MESH) ? lookup_or_create_submesh(mesh, submesh_name) : NULL;
+       free(submesh_name);
        mesh->self->devclass = devclass == DEV_CLASS_UNKNOWN ? mesh->devclass : devclass;
 
        // Initialize configuration directory
@@ -969,6 +975,10 @@ static struct timespec idle(event_loop_t *loop, void *data) {
        meshlink_handle_t *mesh = data;
        struct timespec t, tmin = {3600, 0};
 
+#ifdef HAVE_SENDMMSG
+       flush_mmsg(mesh);
+#endif
+
        for splay_each(node_t, n, mesh->nodes) {
                if(!n->utcp) {
                        continue;
@@ -1646,6 +1656,9 @@ bool meshlink_start(meshlink_handle_t *mesh) {
                return false;
        }
 
+#if defined(HAVE_RECVMMSG) || defined(HAVE_SENDMMSG)
+       init_mmsg(mesh);
+#endif
        init_outgoings(mesh);
        init_adns(mesh);
 
@@ -1720,6 +1733,9 @@ void meshlink_stop(meshlink_handle_t *mesh) {
 
        exit_adns(mesh);
        exit_outgoings(mesh);
+#if defined(HAVE_RECVMMSG) || defined(HAVE_SENDMMSG)
+       exit_mmsg(mesh);
+#endif
 
        // Ensure we are considered unreachable
        if(mesh->nodes) {
@@ -2418,13 +2434,20 @@ bool meshlink_set_canonical_address(meshlink_handle_t *mesh, meshlink_node_t *no
        }
 
        if(!is_valid_hostname(address)) {
-               logger(mesh, MESHLINK_DEBUG, "Invalid character in address: %s\n", address);
+               logger(mesh, MESHLINK_DEBUG, "Invalid character in address: %s", address);
                meshlink_errno = MESHLINK_EINVAL;
                return false;
        }
 
+       if((node_t *)node != mesh->self && !port) {
+               logger(mesh, MESHLINK_DEBUG, "Missing port number!");
+               meshlink_errno = MESHLINK_EINVAL;
+               return false;
+
+       }
+
        if(port && !is_valid_port(port)) {
-               logger(mesh, MESHLINK_DEBUG, "Invalid character in port: %s\n", address);
+               logger(mesh, MESHLINK_DEBUG, "Invalid character in port: %s", address);
                meshlink_errno = MESHLINK_EINVAL;
                return false;
        }
@@ -3036,7 +3059,15 @@ char *meshlink_export(meshlink_handle_t *mesh) {
        packmsg_add_int32(&out, mesh->self->devclass);
        packmsg_add_bool(&out, mesh->self->status.blacklisted);
        packmsg_add_bin(&out, ecdsa_get_public_key(mesh->private_key), 32);
-       packmsg_add_str(&out, mesh->self->canonical_address ? mesh->self->canonical_address : "");
+
+       if(mesh->self->canonical_address && !strchr(mesh->self->canonical_address, ' ')) {
+               char *canonical_address = NULL;
+               xasprintf(&canonical_address, "%s %s", mesh->self->canonical_address, mesh->myport);
+               packmsg_add_str(&out, canonical_address);
+               free(canonical_address);
+       } else {
+               packmsg_add_str(&out, mesh->self->canonical_address ? mesh->self->canonical_address : "");
+       }
 
        uint32_t count = 0;