Avoid allocating packet buffers unnecessarily.

[meshlink] / src / discovery.c

diff --git a/src/discovery.c b/src/discovery.c
index 2af4702365e6b652c543bb9279371f12f19b83ad..2a74cc35bd22a5ef321bc68ce80ff0f50b521143 100644 (file)
--- a/src/discovery.c
+++ b/src/discovery.c
@@ -21,11 +21,11 @@
 #define MESHLINK_MDNS_NAME_KEY "name"
 #define MESHLINK_MDNS_FINGERPRINT_KEY "fingerprint"
 
-static void generate_rand_string(char *buffer, size_t size) {
+static void generate_rand_string(meshlink_handle_t *mesh, char *buffer, size_t size) {
        assert(size);
 
        for(size_t i = 0; i < (size - 1); ++i) {
-               buffer[i] = 'a' + (rand() % ('z' - 'a' + 1));
+               buffer[i] = 'a' + prng(mesh, 'z' - 'a' + 1);
        }
 
        buffer[size - 1] = '\0';
@@ -114,8 +114,6 @@ done:
        free(fingerprint);
        free(txt_name);
        free(txt_fingerprint);
-
-       pthread_mutex_unlock(&(mesh->mesh_mutex));
 }
 
 static void discovery_server_callback(CattaServer *server, CattaServerState state, void *userdata) {
@@ -128,22 +126,22 @@ static void discovery_server_callback(CattaServer *server, CattaServerState stat
        case CATTA_SERVER_RUNNING:
                /* The serve has startup successfully and registered its host
                 * name on the network, so it's time to create our services */
-               pthread_mutex_lock(&(mesh->mesh_mutex));
+               pthread_mutex_lock(&mesh->mutex);
 
                if(!mesh->catta_group) {
                        discovery_create_services(mesh);
                }
 
-               pthread_mutex_unlock(&(mesh->mesh_mutex));
+               pthread_mutex_unlock(&mesh->mutex);
 
                break;
 
        case CATTA_SERVER_COLLISION: {
                /* A host name collision happened. Let's pick a new name for the server */
                char hostname[17];
-               generate_rand_string(hostname, sizeof(hostname));
+               generate_rand_string(mesh, hostname, sizeof(hostname));
 
-               pthread_mutex_lock(&(mesh->mesh_mutex));
+               pthread_mutex_lock(&mesh->mutex);
 
                assert(mesh->catta_server);
                assert(mesh->catta_poll);
@@ -154,12 +152,12 @@ static void discovery_server_callback(CattaServer *server, CattaServerState stat
                        catta_simple_poll_quit(mesh->catta_poll);
                }
 
-               pthread_mutex_unlock(&(mesh->mesh_mutex));
+               pthread_mutex_unlock(&mesh->mutex);
        }
        break;
 
        case CATTA_SERVER_REGISTERING:
-               pthread_mutex_lock(&(mesh->mesh_mutex));
+               pthread_mutex_lock(&mesh->mutex);
 
                /* Let's drop our registered services. When the server is back
                 * in CATTA_SERVER_RUNNING state we will register them
@@ -169,12 +167,12 @@ static void discovery_server_callback(CattaServer *server, CattaServerState stat
                        mesh->catta_group = NULL;
                }
 
-               pthread_mutex_unlock(&(mesh->mesh_mutex));
+               pthread_mutex_unlock(&mesh->mutex);
 
                break;
 
        case CATTA_SERVER_FAILURE:
-               pthread_mutex_lock(&(mesh->mesh_mutex));
+               pthread_mutex_lock(&mesh->mutex);
 
                assert(mesh->catta_server);
                assert(mesh->catta_poll);
@@ -182,7 +180,7 @@ static void discovery_server_callback(CattaServer *server, CattaServerState stat
                /* Terminate on failure */
                catta_simple_poll_quit(mesh->catta_poll);
 
-               pthread_mutex_unlock(&(mesh->mesh_mutex));
+               pthread_mutex_unlock(&mesh->mutex);
                break;
 
        case CATTA_SERVER_INVALID:
@@ -217,7 +215,7 @@ static void discovery_resolve_callback(CattaSServiceResolver *resolver, CattaIfI
                char *node_fp = (char *)catta_string_list_get_text(node_fp_li) + strlen(MESHLINK_MDNS_FINGERPRINT_KEY);
 
                if(node_name[0] == '=' && node_fp[0] == '=') {
-                       pthread_mutex_lock(&(mesh->mesh_mutex));
+                       pthread_mutex_lock(&mesh->mutex);
 
                        node_name += 1;
 
@@ -250,20 +248,21 @@ static void discovery_resolve_callback(CattaSServiceResolver *resolver, CattaIfI
                                }
 
                                if(naddress.unknown.family != AF_UNKNOWN) {
-                                       meshlink_hint_address(mesh, (meshlink_node_t *)node, (struct sockaddr *)&naddress);
-
                                        node_t *n = (node_t *)node;
+                                       connection_t *c = n->connection;
+
+                                       node_add_recent_address(mesh, n, &naddress);
 
-                                       if(n->connection && n->connection->outgoing) {
-                                               n->connection->outgoing->timeout = 0;
+                                       if(c && c->outgoing && !c->status.active) {
+                                               c->outgoing->timeout = 0;
 
-                                               if(n->connection->outgoing->ev.cb) {
-                                                       timeout_set(&mesh->loop, &n->connection->outgoing->ev, &(struct timeval) {
+                                               if(c->outgoing->ev.cb) {
+                                                       timeout_set(&mesh->loop, &c->outgoing->ev, &(struct timespec) {
                                                                0, 0
                                                        });
                                                }
 
-                                               n->connection->last_ping_time = 0;
+                                               c->last_ping_time = 0;
                                        }
 
                                } else {
@@ -273,7 +272,7 @@ static void discovery_resolve_callback(CattaSServiceResolver *resolver, CattaIfI
                                logger(mesh, MESHLINK_WARNING, "Node %s is not part of the mesh network.\n", node_name);
                        }
 
-                       pthread_mutex_unlock(&(mesh->mesh_mutex));
+                       pthread_mutex_unlock(&mesh->mutex);
                }
        }
 
@@ -288,22 +287,22 @@ static void discovery_browse_callback(CattaSServiceBrowser *browser, CattaIfInde
        /* Called whenever a new services becomes available on the LAN or is removed from the LAN */
        switch(event) {
        case CATTA_BROWSER_FAILURE:
-               pthread_mutex_lock(&mesh->mesh_mutex);
+               pthread_mutex_lock(&mesh->mutex);
                catta_simple_poll_quit(mesh->catta_poll);
-               pthread_mutex_unlock(&mesh->mesh_mutex);
+               pthread_mutex_unlock(&mesh->mutex);
                break;
 
        case CATTA_BROWSER_NEW:
-               pthread_mutex_lock(&mesh->mesh_mutex);
+               pthread_mutex_lock(&mesh->mutex);
                catta_s_service_resolver_new(mesh->catta_server, interface_, protocol, name, type, domain, CATTA_PROTO_UNSPEC, 0, discovery_resolve_callback, mesh);
                handle_network_change(mesh, ++mesh->catta_interfaces);
-               pthread_mutex_unlock(&mesh->mesh_mutex);
+               pthread_mutex_unlock(&mesh->mutex);
                break;
 
        case CATTA_BROWSER_REMOVE:
-               pthread_mutex_lock(&mesh->mesh_mutex);
+               pthread_mutex_lock(&mesh->mutex);
                handle_network_change(mesh, --mesh->catta_interfaces);
-               pthread_mutex_unlock(&mesh->mesh_mutex);
+               pthread_mutex_unlock(&mesh->mutex);
                break;
 
        case CATTA_BROWSER_ALL_FOR_NOW:
@@ -379,7 +378,7 @@ static void *discovery_loop(void *userdata) {
 
        // generate some unique host name (we actually do not care about it)
        char hostname[17];
-       generate_rand_string(hostname, sizeof(hostname));
+       generate_rand_string(mesh, hostname, sizeof(hostname));
 
        // Let's set the host name for this server.
        CattaServerConfig config;
@@ -398,7 +397,7 @@ static void *discovery_loop(void *userdata) {
        /* Free the configuration data */
        catta_server_config_free(&config);
 
-       /* Check wether creating the server object succeeded */
+       /* Check whether creating the server object succeeded */
        if(!mesh->catta_server) {
                logger(mesh, MESHLINK_ERROR, "Failed to create discovery server: %s\n", catta_strerror(error));
                goto fail;