Make UTCP retranmissions trigger PMTU probes immediately.

[meshlink] / src / meshlink.c

diff --git a/src/meshlink.c b/src/meshlink.c
index 4e258c5633f1a1e7e2bf1f4982bea39cd81231f6..72f484dbfa68c8b99744571a50f77abaf63a6036 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
@@ -2418,13 +2424,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 +3049,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;
 
@@ -3528,6 +3549,17 @@ static void channel_accept(struct utcp_connection *utcp_connection, uint16_t por
        }
 }
 
+static void channel_retransmit(struct utcp_connection *utcp_connection) {
+       node_t *n = utcp_connection->utcp->priv;
+       meshlink_handle_t *mesh = n->mesh;
+
+       if(n->mtuprobes == 31) {
+               timeout_set(&mesh->loop, &n->mtutimeout, &(struct timespec) {
+                       0, 0
+               });
+       }
+}
+
 static ssize_t channel_send(struct utcp *utcp, const void *data, size_t len) {
        node_t *n = utcp->priv;
 
@@ -3647,6 +3679,7 @@ void meshlink_set_channel_accept_cb(meshlink_handle_t *mesh, meshlink_channel_ac
                if(!n->utcp && n != mesh->self) {
                        n->utcp = utcp_init(channel_accept, channel_pre_accept, channel_send, n);
                        utcp_set_mtu(n->utcp, n->mtu - sizeof(meshlink_packethdr_t));
+                       utcp_set_retransmit_cb(n->utcp, channel_retransmit);
                }
        }
 
@@ -3696,6 +3729,7 @@ meshlink_channel_t *meshlink_channel_open_ex(meshlink_handle_t *mesh, meshlink_n
        if(!n->utcp) {
                n->utcp = utcp_init(channel_accept, channel_pre_accept, channel_send, n);
                utcp_set_mtu(n->utcp, n->mtu - sizeof(meshlink_packethdr_t));
+               utcp_set_retransmit_cb(n->utcp, channel_retransmit);
                mesh->receive_cb = channel_receive;
 
                if(!n->utcp) {
@@ -4005,6 +4039,7 @@ void meshlink_set_node_channel_timeout(meshlink_handle_t *mesh, meshlink_node_t
        if(!n->utcp) {
                n->utcp = utcp_init(channel_accept, channel_pre_accept, channel_send, n);
                utcp_set_mtu(n->utcp, n->mtu - sizeof(meshlink_packethdr_t));
+               utcp_set_retransmit_cb(n->utcp, channel_retransmit);
        }
 
        utcp_set_user_timeout(n->utcp, timeout);
@@ -4016,6 +4051,7 @@ void update_node_status(meshlink_handle_t *mesh, node_t *n) {
        if(n->status.reachable && mesh->channel_accept_cb && !n->utcp) {
                n->utcp = utcp_init(channel_accept, channel_pre_accept, channel_send, n);
                utcp_set_mtu(n->utcp, n->mtu - sizeof(meshlink_packethdr_t));
+               utcp_set_retransmit_cb(n->utcp, channel_retransmit);
        }
 
        if(mesh->node_status_cb) {