X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fnet_setup.c;h=fd4386746c2b1f626a35bb273e456ce3f08a80b0;hb=e4e5a81447142da0fb1291b2d2119ed6981b89e5;hp=7f3358168d5891abb1c515cd47d0279557f1adef;hpb=82a9712857c5b640288174493905499093853997;p=meshlink diff --git a/src/net_setup.c b/src/net_setup.c index 7f335816..fd438674 100644 --- a/src/net_setup.c +++ b/src/net_setup.c @@ -32,8 +32,6 @@ #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; @@ -88,7 +86,7 @@ bool read_ecdsa_private_key(meshlink_handle_t *mesh) { fp = fopen(filename, "r"); if(!fp) { - logger(DEBUG_ALWAYS, LOG_ERR, "Error reading ECDSA private key file: %s", strerror(errno)); + logger(mesh, MESHLINK_ERROR, "Error reading ECDSA private key file: %s", strerror(errno)); return false; } @@ -96,7 +94,7 @@ bool read_ecdsa_private_key(meshlink_handle_t *mesh) { fclose(fp); if(!mesh->self->connection->ecdsa) - logger(DEBUG_ALWAYS, LOG_ERR, "Reading ECDSA private key file failed: %s", strerror(errno)); + logger(mesh, MESHLINK_ERROR, "Reading ECDSA private key file failed: %s", strerror(errno)); return mesh->self->connection->ecdsa; } @@ -118,12 +116,71 @@ static bool read_invitation_key(meshlink_handle_t *mesh) { mesh->invitation_key = ecdsa_read_pem_private_key(fp); fclose(fp); if(!mesh->invitation_key) - logger(DEBUG_ALWAYS, LOG_ERR, "Reading ECDSA private key file `%s' failed: %s", filename, strerror(errno)); + logger(mesh, MESHLINK_ERROR, "Reading ECDSA private key file `%s' failed: %s", filename, strerror(errno)); } return mesh->invitation_key; } +bool node_read_devclass(meshlink_handle_t *mesh, node_t *n) { + if(n->devclass != 0) + return true; + + 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) + 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; @@ -132,7 +189,7 @@ void load_all_nodes(meshlink_handle_t *mesh) { snprintf(dname,PATH_MAX, "%s" SLASH "hosts", mesh->confbase); dir = opendir(dname); if(!dir) { - logger(DEBUG_ALWAYS, LOG_ERR, "Could not open %s: %s", dname, strerror(errno)); + logger(mesh, MESHLINK_ERROR, "Could not open %s: %s", dname, strerror(errno)); return; } @@ -146,6 +203,7 @@ void load_all_nodes(meshlink_handle_t *mesh) { n = new_node(); n->name = xstrdup(ent->d_name); + node_read_devclass(mesh, n); node_add(mesh, n); } @@ -162,7 +220,7 @@ char *get_name(meshlink_handle_t *mesh) { return NULL; if(!check_id(name)) { - logger(DEBUG_ALWAYS, LOG_ERR, "Invalid name for mesh->self!"); + logger(mesh, MESHLINK_ERROR, "Invalid name for mesh->self!"); free(name); return NULL; } @@ -174,7 +232,6 @@ bool setup_myself_reloadable(meshlink_handle_t *mesh) { 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); @@ -209,7 +266,7 @@ static bool add_listen_address(meshlink_handle_t *mesh, char *address, bool bind free(address); if(err || !ai) { - logger(DEBUG_ALWAYS, LOG_ERR, "System call `%s' failed: %s", "getaddrinfo", err == EAI_SYSTEM ? strerror(err) : gai_strerror(err)); + logger(mesh, MESHLINK_ERROR, "System call `%s' failed: %s", "getaddrinfo", err == EAI_SYSTEM ? strerror(err) : gai_strerror(err)); return false; } @@ -227,7 +284,7 @@ static bool add_listen_address(meshlink_handle_t *mesh, char *address, bool bind continue; if(mesh->listen_sockets >= MAXSOCKETS) { - logger(DEBUG_ALWAYS, LOG_ERR, "Too many listening sockets"); + logger(mesh, MESHLINK_ERROR, "Too many listening sockets"); return false; } @@ -246,9 +303,9 @@ static bool add_listen_address(meshlink_handle_t *mesh, char *address, bool bind io_add(&mesh->loop, &mesh->listen_socket[mesh->listen_sockets].tcp, handle_new_meta_connection, &mesh->listen_socket[mesh->listen_sockets], tcp_fd, IO_READ); io_add(&mesh->loop, &mesh->listen_socket[mesh->listen_sockets].udp, handle_incoming_vpn_data, &mesh->listen_socket[mesh->listen_sockets], udp_fd, IO_READ); - if(mesh->debug_level >= DEBUG_CONNECTIONS) { + if(mesh->log_level >= MESHLINK_INFO) { char *hostname = sockaddr2hostname((sockaddr_t *) aip->ai_addr); - logger(DEBUG_CONNECTIONS, LOG_NOTICE, "Listening on %s", hostname); + logger(mesh, MESHLINK_INFO, "Listening on %s", hostname); free(hostname); } @@ -269,18 +326,21 @@ bool setup_myself(meshlink_handle_t *mesh) { char *address = NULL; if(!(name = get_name(mesh))) { - logger(DEBUG_ALWAYS, LOG_ERR, "Name for tinc daemon required!"); + logger(mesh, MESHLINK_ERROR, "Name for MeshLink instance required!"); return false; } mesh->self = new_node(); mesh->self->connection = new_connection(); mesh->self->name = name; + mesh->self->devclass = mesh->devclass; mesh->self->connection->name = xstrdup(name); read_host_config(mesh, mesh->config, name); - if(!get_config_string(lookup_config(mesh->config, "Port"), &mesh->myport)) - mesh->myport = xstrdup("655"); + if(!get_config_string(lookup_config(mesh->config, "Port"), &mesh->myport)) { + logger(mesh, MESHLINK_ERROR, "Port for MeshLink instance required!"); + return false; + } mesh->self->connection->options = 0; mesh->self->connection->protocol_major = PROT_MAJOR; @@ -324,8 +384,7 @@ bool setup_myself(meshlink_handle_t *mesh) { graph(mesh); - if(autoconnect) - load_all_nodes(mesh); + load_all_nodes(mesh); /* Open sockets */ @@ -335,15 +394,10 @@ bool setup_myself(meshlink_handle_t *mesh) { return false; if(!mesh->listen_sockets) { - logger(DEBUG_ALWAYS, LOG_ERR, "Unable to create any listening socket!"); + logger(mesh, MESHLINK_ERROR, "Unable to create any listening socket!"); return false; } - // TODO: require Port to be set? Or use "0" and use getsockname()? - - if(!mesh->myport) - mesh->myport = xstrdup("655"); - xasprintf(&mesh->self->hostname, "MYSELF port %s", mesh->myport); mesh->self->connection->hostname = xstrdup(mesh->self->hostname); @@ -377,11 +431,13 @@ bool setup_network(meshlink_handle_t *mesh) { close all open network connections */ void close_network_connections(meshlink_handle_t *mesh) { - for(list_node_t *node = mesh->connections->head, *next; node; node = next) { - next = node->next; - connection_t *c = node->data; - c->outgoing = NULL; - terminate_connection(mesh, c, false); + if(mesh->connections) { + for(list_node_t *node = mesh->connections->head, *next; node; node = next) { + next = node->next; + connection_t *c = node->data; + c->outgoing = NULL; + terminate_connection(mesh, c, false); + } } if(mesh->outgoings)