manynodes example: trivial, change debug levels

[meshlink] / src / meshlink.c

diff --git a/src/meshlink.c b/src/meshlink.c
index b8fb5055a41ed82a9ae740492f72cf0ab7e2b6b1..7f009d940468a30afd704c2371c3bd25261b4e18 100644 (file)
--- a/src/meshlink.c
+++ b/src/meshlink.c
@@ -742,11 +742,11 @@ static bool meshlink_setup(meshlink_handle_t *mesh) {
        return true;
 }
 
-meshlink_handle_t *meshlink_open(const char *confbase, const char *name, const char* appname) {
-       return meshlink_open_with_size(confbase, name, appname, sizeof(meshlink_handle_t));
+meshlink_handle_t *meshlink_open(const char *confbase, const char *name, const char* appname, dclass_t dclass) {
+       return meshlink_open_with_size(confbase, name, appname, dclass, sizeof(meshlink_handle_t));
 }
 
-meshlink_handle_t *meshlink_open_with_size(const char *confbase, const char *name, const char* appname, size_t size) {
+meshlink_handle_t *meshlink_open_with_size(const char *confbase, const char *name, const char* appname, dclass_t dclass, size_t size) {
 
        // Validate arguments provided by the application
        bool usingname = false;
@@ -779,6 +779,7 @@ meshlink_handle_t *meshlink_open_with_size(const char *confbase, const char *nam
        meshlink_handle_t *mesh = xzalloc(size);
        mesh->confbase = xstrdup(confbase);
        mesh->appname = xstrdup(appname);
+       mesh->dclass = dclass;
        if (usingname) mesh->name = xstrdup(name);
        pthread_mutex_init ( &(mesh->nodes_mutex), NULL);
        mesh->threadstarted = false;
@@ -934,6 +935,7 @@ void meshlink_close(meshlink_handle_t *mesh) {
        ecdsa_free(mesh->invitation_key);
 
        free(mesh->name);
+       free(mesh->appname);
        free(mesh->confbase);
 
        memset(mesh, 0, sizeof *mesh);
@@ -1677,39 +1679,21 @@ void meshlink_whitelist(meshlink_handle_t *mesh, meshlink_node_t *node) {
 /* Hint that a hostname may be found at an address
  * See header file for detailed comment.
  */
-extern void meshlink_hint_address(meshlink_handle_t *mesh, meshlink_node_t *node, struct sockaddr *addr) {
+extern void meshlink_hint_address(meshlink_handle_t *mesh, meshlink_node_t *node, const struct sockaddr *addr) {
        if(!mesh || !node || !addr)
                return;
        
-       char *addr_str = malloc(MAX_ADDRESS_LENGTH*sizeof(char));
-       memset(addr_str, 0, MAX_ADDRESS_LENGTH*sizeof(char));
+       char *host = NULL, *port = NULL, *str = NULL;
+       sockaddr2str((const sockaddr_t *)addr, &host, &port);
 
-       char *port_str = malloc(MAX_PORT_LENGTH*sizeof(char));
-       memset(port_str, 0, MAX_PORT_LENGTH*sizeof(char));
-       
-       // extra byte for a space, and one to make sure string is null-terminated
-       int full_addr_len = MAX_ADDRESS_LENGTH + MAX_PORT_LENGTH + 2;
-
-       char *full_addr_str = malloc(full_addr_len*sizeof(char));
-       memset(full_addr_str, 0, full_addr_len*sizeof(char));
-       
-       // get address and port number
-       if(!get_ip_str(addr, addr_str, MAX_ADDRESS_LENGTH))
-               goto fail;
-       if(!get_port_str(addr, port_str, MAX_ADDRESS_LENGTH))
-               goto fail;
-
-       // append_config_file expects an address, a space, and then a port number
-       strcat(full_addr_str, addr_str);
-       strcat(full_addr_str, " ");
-       strcat(full_addr_str, port_str);
-       
-       append_config_file(mesh, node->name, "Address", full_addr_str);
+       if(host && port) {
+               xasprintf(&str, "%s %s", host, port);
+               append_config_file(mesh, node->name, "Address", str);
+       }
 
-fail:
-       free(addr_str);
-       free(port_str);
-       free(full_addr_str);
+       free(str);
+       free(host);
+       free(port);
 
        // @TODO do we want to fire off a connection attempt right away?
 }
@@ -1721,3 +1705,20 @@ static void __attribute__((constructor)) meshlink_init(void) {
 static void __attribute__((destructor)) meshlink_exit(void) {
        crypto_exit();
 }
+
+int weight_from_dclass(dclass_t dclass)
+{
+       switch(dclass)
+       {
+       case BACKBONE:
+               return 1;
+
+       case STATIONARY:
+               return 3;
+
+       case PORTABLE:
+               return 6;
+       }
+
+       return 9;
+}