converging auto connect algorithm

[meshlink] / src / meshlink.c

diff --git a/src/meshlink.c b/src/meshlink.c
index 0ecab432912b4dc9c384700aea5043ac9160169c..3661f064c4ef6a89279503525ac5275ea7863f88 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, dclass_t dclass) {
-       return meshlink_open_with_size(confbase, name, appname, dclass, sizeof(meshlink_handle_t));
+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, dclass_t dclass, size_t size) {
+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;
@@ -776,10 +776,16 @@ meshlink_handle_t *meshlink_open_with_size(const char *confbase, const char *nam
                } else { usingname = true;}
        }
 
+       if(devclass < 0 || devclass > _DEV_CLASS_MAX) {
+               logger(NULL, MESHLINK_ERROR, "Invalid devclass given!\n");
+               meshlink_errno = MESHLINK_EINVAL;
+               return NULL;
+       }
+
        meshlink_handle_t *mesh = xzalloc(size);
        mesh->confbase = xstrdup(confbase);
        mesh->appname = xstrdup(appname);
-       mesh->dclass = dclass;
+       mesh->devclass = devclass;
        if (usingname) mesh->name = xstrdup(name);
        pthread_mutex_init ( &(mesh->nodes_mutex), NULL);
        mesh->threadstarted = false;
@@ -1679,39 +1685,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?
 }
@@ -1724,9 +1712,11 @@ static void __attribute__((destructor)) meshlink_exit(void) {
        crypto_exit();
 }
 
-int weight_from_dclass(dclass_t dclass)
-{
-       if(dclass == PORTABLE)
-               return 3;
-       return 1;
-}
+
+/// Device class
+dev_class_traits_t dev_class_traits[_DEV_CLASS_MAX +1] = {
+       { .min_connects = 3, .max_connects = 10000, .edge_weight = 1 }, // DEV_CLASS_BACKBONE
+       { .min_connects = 3, .max_connects = 100, .edge_weight = 3 },   // DEV_CLASS_STATIONARY
+       { .min_connects = 3, .max_connects = 3, .edge_weight = 6 },             // DEV_CLASS_PORTABLE
+       { .min_connects = 1, .max_connects = 1, .edge_weight = 9 },             // DEV_CLASS_UNKNOWN
+};