#define VAR_MULTIPLE 4 /* Multiple statements allowed */
#define VAR_OBSOLETE 8 /* Should not be used anymore */
#define VAR_SAFE 16 /* Variable is safe when accepting invitations */
+#define MAX_ADDRESS_LENGTH 45 /* Max length of an (IPv6) address */
+#define MAX_PORT_LENGTH 5 /* 0-65535 */
typedef struct {
const char *name;
int type;
#include "crypto.h"
#include "ecdsagen.h"
+#include "logger.h"
#include "meshlink_internal.h"
#include "netutl.h"
#include "node.h"
#include "utils.h"
#include "xalloc.h"
#include "ed25519/sha512.h"
+#include "discovery.h"
#ifndef MSG_NOSIGNAL
#define MSG_NOSIGNAL 0
#endif
+static pthread_mutex_t global_mutex;
+
__thread meshlink_errno_t meshlink_errno;
+meshlink_log_cb_t global_log_cb;
+meshlink_log_level_t global_log_level;
//TODO: this can go away completely
const var_t variables[] = {
static bool fcopy(FILE *out, const char *filename) {
FILE *in = fopen(filename, "r");
if(!in) {
- fprintf(stderr, "Could not open %s: %s\n", filename, strerror(errno));
+ logger(NULL, MESHLINK_ERROR, "Could not open %s: %s\n", filename, strerror(errno));
return false;
}
goto done;
// If that doesn't work, guess externally visible hostname
- fprintf(stderr, "Trying to discover externally visible hostname...\n");
+ logger(mesh, MESHLINK_DEBUG, "Trying to discover externally visible hostname...\n");
struct addrinfo *ai = str2addrinfo("meshlink.io", "80", SOCK_STREAM);
struct addrinfo *aip = ai;
static const char request[] = "GET http://www.meshlink.io/host.cgi HTTP/1.0\r\n\r\n";
fprintf(f, "\nAddress = %s\n", hostname);
fclose(f);
} else {
- fprintf(stderr, "Could not append Address to %s: %s\n", filename, strerror(errno));
+ logger(mesh, MESHLINK_DEBUG, "Could not append Address to %s: %s\n", filename, strerror(errno));
}
done:
const char *end = strchr(*data, '\n');
size_t len = end ? end - *data : strlen(*data);
if(len >= sizeof line) {
- fprintf(stderr, "Maximum line length exceeded!\n");
+ logger(NULL, MESHLINK_ERROR, "Maximum line length exceeded!\n");
return NULL;
}
if(len && !isprint(**data))
snprintf(filename, sizeof filename, "%s" SLASH "hosts" SLASH "%s", mesh->confbase, mesh->name);
FILE *f = fopen(filename, "a");
if(!f) {
- fprintf(stderr, "Please change MeshLink's Port manually.\n");
+ logger(mesh, MESHLINK_DEBUG, "Please change MeshLink's Port manually.\n");
return 0;
}
}
}
- fprintf(stderr, "Please change MeshLink's Port manually.\n");
+ logger(mesh, MESHLINK_DEBUG, "Please change MeshLink's Port manually.\n");
return 0;
}
static bool finalize_join(meshlink_handle_t *mesh) {
char *name = xstrdup(get_value(mesh->data, "Name"));
if(!name) {
- fprintf(stderr, "No Name found in invitation!\n");
+ logger(mesh, MESHLINK_DEBUG, "No Name found in invitation!\n");
return false;
}
if(!check_id(name)) {
- fprintf(stderr, "Invalid Name found in invitation: %s!\n", name);
+ logger(mesh, MESHLINK_DEBUG, "Invalid Name found in invitation: %s!\n", name);
return false;
}
FILE *f = fopen(filename, "w");
if(!f) {
- fprintf(stderr, "Could not create file %s: %s\n", filename, strerror(errno));
+ logger(mesh, MESHLINK_DEBUG, "Could not create file %s: %s\n", filename, strerror(errno));
return false;
}
snprintf(filename, sizeof filename, "%s" SLASH "hosts" SLASH "%s", mesh->confbase, name);
FILE *fh = fopen(filename, "w");
if(!fh) {
- fprintf(stderr, "Could not create file %s: %s\n", filename, strerror(errno));
+ logger(mesh, MESHLINK_DEBUG, "Could not create file %s: %s\n", filename, strerror(errno));
fclose(f);
return false;
}
// Ignore unknown and unsafe variables
if(!found) {
- fprintf(stderr, "Ignoring unknown variable '%s' in invitation.\n", l);
+ logger(mesh, MESHLINK_DEBUG, "Ignoring unknown variable '%s' in invitation.\n", l);
continue;
} else if(!(variables[i].type & VAR_SAFE)) {
- fprintf(stderr, "Ignoring unsafe variable '%s' in invitation.\n", l);
+ logger(mesh, MESHLINK_DEBUG, "Ignoring unsafe variable '%s' in invitation.\n", l);
continue;
}
while(l && !strcasecmp(l, "Name")) {
if(!check_id(value)) {
- fprintf(stderr, "Invalid Name found in invitation.\n");
+ logger(mesh, MESHLINK_DEBUG, "Invalid Name found in invitation.\n");
return false;
}
if(!strcmp(value, name)) {
- fprintf(stderr, "Secondary chunk would overwrite our own host config file.\n");
+ logger(mesh, MESHLINK_DEBUG, "Secondary chunk would overwrite our own host config file.\n");
return false;
}
f = fopen(filename, "w");
if(!f) {
- fprintf(stderr, "Could not create file %s: %s\n", filename, strerror(errno));
+ logger(mesh, MESHLINK_DEBUG, "Could not create file %s: %s\n", filename, strerror(errno));
return false;
}
mesh->self->name = xstrdup(name);
mesh->self->connection->name = name;
- fprintf(stderr, "Configuration stored in: %s\n", mesh->confbase);
+ logger(mesh, MESHLINK_DEBUG, "Configuration stored in: %s\n", mesh->confbase);
load_all_nodes(mesh);
return finalize_join(mesh);
case 2:
- fprintf(stderr, "Invitation succesfully accepted.\n");
+ logger(mesh, MESHLINK_DEBUG, "Invitation succesfully accepted.\n");
shutdown(mesh->sock, SHUT_RDWR);
mesh->success = true;
break;
FILE *f;
char pubname[PATH_MAX], privname[PATH_MAX];
- fprintf(stderr, "Generating ECDSA keypair:\n");
+ logger(mesh, MESHLINK_DEBUG, "Generating ECDSA keypair:\n");
if(!(key = ecdsa_generate())) {
- fprintf(stderr, "Error during key generation!\n");
+ logger(mesh, MESHLINK_DEBUG, "Error during key generation!\n");
meshlink_errno = MESHLINK_EINTERNAL;
return false;
} else
- fprintf(stderr, "Done.\n");
+ logger(mesh, MESHLINK_DEBUG, "Done.\n");
snprintf(privname, sizeof privname, "%s" SLASH "ecdsa_key.priv", mesh->confbase);
f = fopen(privname, "w");
#endif
if(!ecdsa_write_pem_private_key(key, f)) {
- fprintf(stderr, "Error writing private key!\n");
+ logger(mesh, MESHLINK_DEBUG, "Error writing private key!\n");
ecdsa_free(key);
fclose(f);
meshlink_errno = MESHLINK_EINTERNAL;
static bool meshlink_setup(meshlink_handle_t *mesh) {
if(mkdir(mesh->confbase, 0777) && errno != EEXIST) {
- fprintf(stderr, "Could not create directory %s: %s\n", mesh->confbase, strerror(errno));
+ logger(mesh, MESHLINK_DEBUG, "Could not create directory %s: %s\n", mesh->confbase, strerror(errno));
meshlink_errno = MESHLINK_ESTORAGE;
return false;
}
snprintf(filename, sizeof filename, "%s" SLASH "hosts", mesh->confbase);
if(mkdir(filename, 0777) && errno != EEXIST) {
- fprintf(stderr, "Could not create directory %s: %s\n", filename, strerror(errno));
+ logger(mesh, MESHLINK_DEBUG, "Could not create directory %s: %s\n", filename, strerror(errno));
meshlink_errno = MESHLINK_ESTORAGE;
return false;
}
snprintf(filename, sizeof filename, "%s" SLASH "meshlink.conf", mesh->confbase);
if(!access(filename, F_OK)) {
- fprintf(stderr, "Configuration file %s already exists!\n", filename);
+ logger(mesh, MESHLINK_DEBUG, "Configuration file %s already exists!\n", filename);
meshlink_errno = MESHLINK_EEXIST;
return false;
}
FILE *f = fopen(filename, "w");
if(!f) {
- fprintf(stderr, "Could not create file %s: %s\n", filename, strerror(errno));
+ logger(mesh, MESHLINK_DEBUG, "Could not create file %s: %s\n", filename, strerror(errno));
meshlink_errno = MESHLINK_ESTORAGE;
return false;
}
return true;
}
-
-meshlink_handle_t *meshlink_open(const char *confbase, const char *name) {
- return meshlink_open_with_size(confbase, name, 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, dev_class_t devclass, size_t size) {
-meshlink_handle_t *meshlink_open_with_size(const char *confbase, const char *name, size_t size) {
// Validate arguments provided by the application
bool usingname = false;
if(!confbase || !*confbase) {
- fprintf(stderr, "No confbase given!\n");
+ logger(NULL, MESHLINK_ERROR, "No confbase given!\n");
+ meshlink_errno = MESHLINK_EINVAL;
+ return NULL;
+ }
+
+ if(!appname || !*appname) {
+ logger(NULL, MESHLINK_ERROR, "No appname given!\n");
meshlink_errno = MESHLINK_EINVAL;
return NULL;
}
if(!name || !*name) {
- fprintf(stderr, "No name given!\n");
+ logger(NULL, MESHLINK_ERROR, "No name given!\n");
//return NULL;
}
else { //check name only if there is a name != NULL
if(!check_id(name)) {
- fprintf(stderr, "Invalid name given!\n");
+ logger(NULL, MESHLINK_ERROR, "Invalid name given!\n");
meshlink_errno = MESHLINK_EINVAL;
return NULL;
} 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->devclass = devclass;
if (usingname) mesh->name = xstrdup(name);
pthread_mutex_init ( &(mesh->nodes_mutex), NULL);
mesh->threadstarted = false;
event_loop_init(&mesh->loop);
mesh->loop.data = mesh;
- // TODO: should be set by a function.
- mesh->debug_level = 5;
-
// Check whether meshlink.conf already exists
char filename[PATH_MAX];
return NULL;
}
} else {
- fprintf(stderr, "Cannot not read from %s: %s\n", filename, strerror(errno));
+ logger(NULL, MESHLINK_ERROR, "Cannot not read from %s: %s\n", filename, strerror(errno));
meshlink_close(mesh);
meshlink_errno = MESHLINK_ESTORAGE;
return NULL;
try_outgoing_connections(mesh);
- fprintf(stderr, "Starting main_loop...\n");
+ logger(mesh, MESHLINK_DEBUG, "Starting main_loop...\n");
main_loop(mesh);
- fprintf(stderr, "main_loop returned.\n");
+ logger(mesh, MESHLINK_DEBUG, "main_loop returned.\n");
return NULL;
}
bool meshlink_start(meshlink_handle_t *mesh) {
+
+ logger(mesh, MESHLINK_DEBUG, "meshlink_start called\n");
+
if(!mesh) {
meshlink_errno = MESHLINK_EINVAL;
return false;
//Check that a valid name is set
if(!mesh->name ) {
- fprintf(stderr, "No name given!\n");
+ logger(mesh, MESHLINK_DEBUG, "No name given!\n");
meshlink_errno = MESHLINK_EINVAL;
return false;
}
// Start the main thread
if(pthread_create(&mesh->thread, NULL, meshlink_main_loop, mesh) != 0) {
- fprintf(stderr, "Could not start thread: %s\n", strerror(errno));
+ logger(mesh, MESHLINK_DEBUG, "Could not start thread: %s\n", strerror(errno));
memset(&mesh->thread, 0, sizeof mesh->thread);
meshlink_errno = MESHLINK_EINTERNAL;
return false;
mesh->threadstarted=true;
+ discovery_start(mesh);
+
return true;
}
void meshlink_stop(meshlink_handle_t *mesh) {
+
+ logger(mesh, MESHLINK_DEBUG, "meshlink_stop called\n");
+
if(!mesh) {
meshlink_errno = MESHLINK_EINVAL;
return;
}
- listen_socket_t *s = &mesh->listen_socket[0];
+ // Stop discovery
+ discovery_stop(mesh);
// Shut down a listening socket to signal the main thread to shut down
+ listen_socket_t *s = &mesh->listen_socket[0];
shutdown(s->tcp.fd, SHUT_RDWR);
// Wait for the main thread to finish
io_del(&mesh->loop, &s->tcp);
s->tcp.fd = setup_listen_socket(&s->sa);
if(s->tcp.fd < 0)
- logger(DEBUG_ALWAYS, LOG_ERR, "Could not repair listenen socket!");
+ logger(mesh, MESHLINK_ERROR, "Could not repair listenen socket!");
else
io_add(&mesh->loop, &s->tcp, handle_new_meta_connection, s, s->tcp.fd, IO_READ);
}
close_network_connections(mesh);
- logger(DEBUG_ALWAYS, LOG_NOTICE, "Terminating");
+ logger(mesh, MESHLINK_INFO, "Terminating");
exit_configuration(&mesh->config);
event_loop_exit(&mesh->loop);
ecdsa_free(mesh->invitation_key);
free(mesh->name);
+ free(mesh->appname);
free(mesh->confbase);
memset(mesh, 0, sizeof *mesh);
}
void meshlink_set_log_cb(meshlink_handle_t *mesh, meshlink_log_level_t level, meshlink_log_cb_t cb) {
- if(!mesh) {
- meshlink_errno = MESHLINK_EINVAL;
- return;
+ if(mesh) {
+ mesh->log_cb = cb;
+ mesh->log_level = cb ? level : 0;
+ } else {
+ global_log_cb = cb;
+ global_log_level = cb ? level : 0;
}
-
- mesh->log_cb = cb;
- mesh->log_level = level;
}
bool meshlink_send(meshlink_handle_t *mesh, meshlink_node_t *destination, const void *data, size_t len) {
snprintf(filename, sizeof filename, "%s" SLASH "invitations", mesh->confbase);
if(mkdir(filename, 0700) && errno != EEXIST) {
- fprintf(stderr, "Could not create directory %s: %s\n", filename, strerror(errno));
+ logger(mesh, MESHLINK_DEBUG, "Could not create directory %s: %s\n", filename, strerror(errno));
meshlink_errno = MESHLINK_ESTORAGE;
return false;
}
// Count the number of valid invitations, clean up old ones
DIR *dir = opendir(filename);
if(!dir) {
- fprintf(stderr, "Could not read directory %s: %s\n", filename, strerror(errno));
+ logger(mesh, MESHLINK_DEBUG, "Could not read directory %s: %s\n", filename, strerror(errno));
meshlink_errno = MESHLINK_ESTORAGE;
return false;
}
else
unlink(invname);
} else {
- fprintf(stderr, "Could not stat %s: %s\n", invname, strerror(errno));
+ logger(mesh, MESHLINK_DEBUG, "Could not stat %s: %s\n", invname, strerror(errno));
errno = 0;
}
}
if(errno) {
- fprintf(stderr, "Error while reading directory %s: %s\n", filename, strerror(errno));
+ logger(mesh, MESHLINK_DEBUG, "Error while reading directory %s: %s\n", filename, strerror(errno));
closedir(dir);
meshlink_errno = MESHLINK_ESTORAGE;
return false;
FILE *f = fopen(filename, "r");
if(!f) {
if(errno != ENOENT) {
- fprintf(stderr, "Could not read %s: %s\n", filename, strerror(errno));
+ logger(mesh, MESHLINK_DEBUG, "Could not read %s: %s\n", filename, strerror(errno));
meshlink_errno = MESHLINK_ESTORAGE;
return false;
}
mesh->invitation_key = ecdsa_generate();
if(!mesh->invitation_key) {
- fprintf(stderr, "Could not generate a new key!\n");
+ logger(mesh, MESHLINK_DEBUG, "Could not generate a new key!\n");
meshlink_errno = MESHLINK_EINTERNAL;
return false;
}
f = fopen(filename, "w");
if(!f) {
- fprintf(stderr, "Could not write %s: %s\n", filename, strerror(errno));
+ logger(mesh, MESHLINK_DEBUG, "Could not write %s: %s\n", filename, strerror(errno));
meshlink_errno = MESHLINK_ESTORAGE;
return false;
}
mesh->invitation_key = ecdsa_read_pem_private_key(f);
fclose(f);
if(!mesh->invitation_key) {
- fprintf(stderr, "Could not read private key from %s\n", filename);
+ logger(mesh, MESHLINK_DEBUG, "Could not read private key from %s\n", filename);
meshlink_errno = MESHLINK_ESTORAGE;
}
}
for(const char *p = address; *p; p++) {
if(isalnum(*p) || *p == '-' || *p == '.' || *p == ':')
continue;
- fprintf(stderr, "Invalid character in address: %s\n", address);
+ logger(mesh, MESHLINK_DEBUG, "Invalid character in address: %s\n", address);
meshlink_errno = MESHLINK_EINVAL;
return false;
}
// Check validity of the new node's name
if(!check_id(name)) {
- fprintf(stderr, "Invalid name for node.\n");
+ logger(mesh, MESHLINK_DEBUG, "Invalid name for node.\n");
meshlink_errno = MESHLINK_EINVAL;
return NULL;
}
char filename[PATH_MAX];
snprintf(filename, sizeof filename, "%s" SLASH "hosts" SLASH "%s", mesh->confbase, name);
if(!access(filename, F_OK)) {
- fprintf(stderr, "A host config file for %s already exists!\n", name);
+ logger(mesh, MESHLINK_DEBUG, "A host config file for %s already exists!\n", name);
meshlink_errno = MESHLINK_EEXIST;
return NULL;
}
// Ensure no other nodes know about this name
if(meshlink_get_node(mesh, name)) {
- fprintf(stderr, "A node with name %s is already known!\n", name);
+ logger(mesh, MESHLINK_DEBUG, "A node with name %s is already known!\n", name);
meshlink_errno = MESHLINK_EEXIST;
return NULL;
}
// Get the local address
char *address = get_my_hostname(mesh);
if(!address) {
- fprintf(stderr, "No Address known for ourselves!\n");
+ logger(mesh, MESHLINK_DEBUG, "No Address known for ourselves!\n");
meshlink_errno = MESHLINK_ERESOLV;
return NULL;
}
snprintf(filename, sizeof filename, "%s" SLASH "invitations" SLASH "%s", mesh->confbase, cookiehash);
int ifd = open(filename, O_RDWR | O_CREAT | O_EXCL, 0600);
if(!ifd) {
- fprintf(stderr, "Could not create invitation file %s: %s\n", filename, strerror(errno));
+ logger(mesh, MESHLINK_DEBUG, "Could not create invitation file %s: %s\n", filename, strerror(errno));
meshlink_errno = MESHLINK_ESTORAGE;
return NULL;
}
}
fclose(tc);
} else {
- fprintf(stderr, "Could not create %s: %s\n", filename, strerror(errno));
+ logger(mesh, MESHLINK_DEBUG, "Could not create %s: %s\n", filename, strerror(errno));
meshlink_errno = MESHLINK_ESTORAGE;
return NULL;
}
mesh->sock = socket(ai->ai_family, ai->ai_socktype, ai->ai_protocol);
if(mesh->sock <= 0) {
- fprintf(stderr, "Could not open socket: %s\n", strerror(errno));
+ logger(mesh, MESHLINK_DEBUG, "Could not open socket: %s\n", strerror(errno));
freeaddrinfo(ai);
meshlink_errno = MESHLINK_ENETWORK;
return false;
}
if(connect(mesh->sock, ai->ai_addr, ai->ai_addrlen)) {
- fprintf(stderr, "Could not connect to %s port %s: %s\n", address, port, strerror(errno));
+ logger(mesh, MESHLINK_DEBUG, "Could not connect to %s port %s: %s\n", address, port, strerror(errno));
closesocket(mesh->sock);
freeaddrinfo(ai);
meshlink_errno = MESHLINK_ENETWORK;
freeaddrinfo(ai);
- fprintf(stderr, "Connected to %s port %s...\n", address, port);
+ logger(mesh, MESHLINK_DEBUG, "Connected to %s port %s...\n", address, port);
// Tell him we have an invitation, and give him our throw-away key.
mesh->blen = 0;
if(!sendline(mesh->sock, "0 ?%s %d.%d", b64key, PROT_MAJOR, 1)) {
- fprintf(stderr, "Error sending request to %s port %s: %s\n", address, port, strerror(errno));
+ logger(mesh, MESHLINK_DEBUG, "Error sending request to %s port %s: %s\n", address, port, strerror(errno));
closesocket(mesh->sock);
meshlink_errno = MESHLINK_ENETWORK;
return false;
int code, hismajor, hisminor = 0;
if(!recvline(mesh, sizeof mesh->line) || sscanf(mesh->line, "%d %s %d.%d", &code, hisname, &hismajor, &hisminor) < 3 || code != 0 || hismajor != PROT_MAJOR || !check_id(hisname) || !recvline(mesh, sizeof mesh->line) || !rstrip(mesh->line) || sscanf(mesh->line, "%d ", &code) != 1 || code != ACK || strlen(mesh->line) < 3) {
- fprintf(stderr, "Cannot read greeting from peer\n");
+ logger(mesh, MESHLINK_DEBUG, "Cannot read greeting from peer\n");
closesocket(mesh->sock);
meshlink_errno = MESHLINK_ENETWORK;
return false;
char *fingerprint = mesh->line + 2;
char hishash[64];
if(sha512(fingerprint, strlen(fingerprint), hishash)) {
- fprintf(stderr, "Could not create hash\n%s\n", mesh->line + 2);
+ logger(mesh, MESHLINK_DEBUG, "Could not create hash\n%s\n", mesh->line + 2);
meshlink_errno = MESHLINK_EINTERNAL;
return false;
}
if(memcmp(hishash, mesh->hash, 18)) {
- fprintf(stderr, "Peer has an invalid key!\n%s\n", mesh->line + 2);
+ logger(mesh, MESHLINK_DEBUG, "Peer has an invalid key!\n%s\n", mesh->line + 2);
meshlink_errno = MESHLINK_EPEER;
return false;
if(len < 0) {
if(errno == EINTR)
continue;
- fprintf(stderr, "Error reading data from %s port %s: %s\n", address, port, strerror(errno));
+ logger(mesh, MESHLINK_DEBUG, "Error reading data from %s port %s: %s\n", address, port, strerror(errno));
meshlink_errno = MESHLINK_ENETWORK;
return false;
}
closesocket(mesh->sock);
if(!mesh->success) {
- fprintf(stderr, "Connection closed by peer, invitation cancelled.\n");
+ logger(mesh, MESHLINK_DEBUG, "Connection closed by peer, invitation cancelled.\n");
meshlink_errno = MESHLINK_EPEER;
return false;
}
return true;
invalid:
- fprintf(stderr, "Invalid invitation URL or you are already connected to a Mesh ?\n");
+ logger(mesh, MESHLINK_DEBUG, "Invalid invitation URL or you are already connected to a Mesh ?\n");
meshlink_errno = MESHLINK_EINVAL;
return false;
}
snprintf(filename, sizeof filename, "%s" SLASH "hosts" SLASH "%s", mesh->confbase, mesh->self->name);
FILE *f = fopen(filename, "r");
if(!f) {
- fprintf(stderr, "Could not open %s: %s\n", filename, strerror(errno));
+ logger(mesh, MESHLINK_DEBUG, "Could not open %s: %s\n", filename, strerror(errno));
meshlink_errno = MESHLINK_ESTORAGE;
return NULL;
}
char *buf = xmalloc(len);
snprintf(buf, len, "Name = %s\n", mesh->self->name);
if(fread(buf + len - fsize - 1, fsize, 1, f) != 1) {
- fprintf(stderr, "Error reading from %s: %s\n", filename, strerror(errno));
+ logger(mesh, MESHLINK_DEBUG, "Error reading from %s: %s\n", filename, strerror(errno));
fclose(f);
meshlink_errno = MESHLINK_ESTORAGE;
return NULL;
}
if(strncmp(data, "Name = ", 7)) {
- fprintf(stderr, "Invalid data\n");
+ logger(mesh, MESHLINK_DEBUG, "Invalid data\n");
meshlink_errno = MESHLINK_EPEER;
return false;
}
char *end = strchr(data + 7, '\n');
if(!end) {
- fprintf(stderr, "Invalid data\n");
+ logger(mesh, MESHLINK_DEBUG, "Invalid data\n");
meshlink_errno = MESHLINK_EPEER;
return false;
}
memcpy(name, data + 7, len);
name[len] = 0;
if(!check_id(name)) {
- fprintf(stderr, "Invalid Name\n");
+ logger(mesh, MESHLINK_DEBUG, "Invalid Name\n");
meshlink_errno = MESHLINK_EPEER;
return false;
}
char filename[PATH_MAX];
snprintf(filename, sizeof filename, "%s" SLASH "hosts" SLASH "%s", mesh->confbase, name);
if(!access(filename, F_OK)) {
- fprintf(stderr, "File %s already exists, not importing\n", filename);
+ logger(mesh, MESHLINK_DEBUG, "File %s already exists, not importing\n", filename);
meshlink_errno = MESHLINK_EEXIST;
return false;
}
if(errno != ENOENT) {
- fprintf(stderr, "Error accessing %s: %s\n", filename, strerror(errno));
+ logger(mesh, MESHLINK_DEBUG, "Error accessing %s: %s\n", filename, strerror(errno));
meshlink_errno = MESHLINK_ESTORAGE;
return false;
}
FILE *f = fopen(filename, "w");
if(!f) {
- fprintf(stderr, "Could not create %s: %s\n", filename, strerror(errno));
+ logger(mesh, MESHLINK_DEBUG, "Could not create %s: %s\n", filename, strerror(errno));
meshlink_errno = MESHLINK_ESTORAGE;
return false;
}
node_t *n;
n = (node_t*)node;
n->status.blacklisted=true;
- fprintf(stderr, "Blacklisted %s.\n",node->name);
+ logger(mesh, MESHLINK_DEBUG, "Blacklisted %s.\n",node->name);
//Make blacklisting persistent in the config file
append_config_file(mesh, n->name, "blacklisted", "yes");
return;
}
+/* 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, const struct sockaddr *addr) {
+ if(!mesh || !node || !addr)
+ return;
+
+ char *host = NULL, *port = NULL, *str = NULL;
+ sockaddr2str((const sockaddr_t *)addr, &host, &port);
+
+ if(host && port) {
+ xasprintf(&str, "%s %s", host, port);
+ append_config_file(mesh, node->name, "Address", str);
+ }
+
+ free(str);
+ free(host);
+ free(port);
+
+ // @TODO do we want to fire off a connection attempt right away?
+}
+
static void __attribute__((constructor)) meshlink_init(void) {
crypto_init();
}
static void __attribute__((destructor)) meshlink_exit(void) {
crypto_exit();
}
+
+
+/// 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
+};
projects / meshlink / blobdiff