#include "utils.h"
#include "xalloc.h"
-int autoconnect = 3;
-
bool node_read_ecdsa_public_key(meshlink_handle_t *mesh, node_t *n) {
if(ecdsa_active(n->ecdsa))
return true;
return mesh->invitation_key;
}
+bool node_read_devclass(meshlink_handle_t *mesh, node_t *n) {
+
+ splay_tree_t *config_tree;
+ char *p;
+
+ init_configuration(&config_tree);
+ if(!read_host_config(mesh, config_tree, n->name))
+ goto exit;
+
+ if(get_config_string(lookup_config(config_tree, "DeviceClass"), &p))
+ {
+ n->devclass = atoi(p);
+ free(p);
+ }
+
+ if(n->devclass < 0 || n->devclass > _DEV_CLASS_MAX)
+ { n->devclass = _DEV_CLASS_MAX; }
+
+exit:
+ exit_configuration(&config_tree);
+ return n->devclass != 0;
+}
+
+bool node_write_devclass(meshlink_handle_t *mesh, node_t *n) {
+
+ if(n->devclass < 0 || n->devclass > _DEV_CLASS_MAX)
+ return false;
+
+ bool result = false;
+
+ splay_tree_t *config_tree;
+ init_configuration(&config_tree);
+
+ // ignore read errors; in case the file does not exist we will create it
+ read_host_config(mesh, config_tree, n->name);
+
+ config_t* cnf = lookup_config(config_tree, "DeviceClass");
+
+ if(!cnf)
+ {
+ cnf = new_config();
+ cnf->variable = xstrdup("DeviceClass");
+ config_add(config_tree, cnf);
+ }
+
+ set_config_int(cnf, n->devclass);
+
+ if(!write_host_config(mesh, config_tree, n->name))
+ goto fail;
+
+ result = true;
+
+fail:
+ exit_configuration(&config_tree);
+ return result;
+}
+
void load_all_nodes(meshlink_handle_t *mesh) {
DIR *dir;
struct dirent *ent;
n = new_node();
n->name = xstrdup(ent->d_name);
+ node_read_devclass(mesh, n);
node_add(mesh, n);
}
mesh->localdiscovery = true;
keylifetime = 3600; // TODO: check if this can be removed as well
mesh->maxtimeout = 900;
- autoconnect = 3;
mesh->self->options |= OPTION_PMTU_DISCOVERY;
read_invitation_key(mesh);
mesh->self = new_node();
mesh->self->connection = new_connection();
mesh->self->name = name;
- mesh->self->dclass = mesh->dclass;
+ mesh->self->devclass = mesh->devclass;
mesh->self->connection->name = xstrdup(name);
read_host_config(mesh, mesh->config, name);
mesh->self->via = mesh->self;
mesh->self->status.reachable = true;
mesh->self->last_state_change = mesh->loop.now.tv_sec;
+
+ node_write_devclass(mesh, mesh->self);
node_add(mesh, mesh->self);
graph(mesh);
- if(autoconnect)
- load_all_nodes(mesh);
+ load_all_nodes(mesh);
/* Open sockets */