+#include "system.h"
+
#include <catta/core.h>
#include <catta/lookup.h>
#include <catta/publish.h>
#include "discovery.h"
#include "sockaddr.h"
#include "logger.h"
-
-#include <pthread.h>
-
-#include <netinet/in.h>
+#include "node.h"
+#include "connection.h"
+#include "xalloc.h"
#define MESHLINK_MDNS_SERVICE_TYPE "_%s._tcp"
#define MESHLINK_MDNS_NAME_KEY "name"
#define MESHLINK_MDNS_FINGERPRINT_KEY "fingerprint"
-static void generate_rand_string(char *buffer, size_t size) {
+static void generate_rand_string(meshlink_handle_t *mesh, char *buffer, size_t size) {
+ assert(size);
+
for(size_t i = 0; i < (size - 1); ++i) {
- buffer[i] = 'a' + (rand() % ('z' - 'a' + 1));
+ buffer[i] = 'a' + prng(mesh, 'z' - 'a' + 1);
}
buffer[size - 1] = '\0';
(void)group;
meshlink_handle_t *mesh = userdata;
- // asserts
- assert(mesh != NULL);
- assert(mesh->catta_server != NULL);
- assert(mesh->catta_poll != NULL);
-
- pthread_mutex_lock(&(mesh->mesh_mutex));
+ assert(mesh);
+ assert(mesh->catta_server);
+ assert(mesh->catta_poll);
/* Called whenever the entry group state changes */
switch(state) {
case CATTA_ENTRY_GROUP_UNCOMMITED:
case CATTA_ENTRY_GROUP_REGISTERING:
- ;
+ break;
}
-
- pthread_mutex_unlock(&(mesh->mesh_mutex));
}
static void discovery_create_services(meshlink_handle_t *mesh) {
+ char *fingerprint = NULL;
char *txt_name = NULL;
+ char *txt_fingerprint = NULL;
- // asserts
- assert(mesh != NULL);
- assert(mesh->name != NULL);
- assert(mesh->myport != NULL);
- assert(mesh->catta_server != NULL);
- assert(mesh->catta_poll != NULL);
- assert(mesh->catta_servicetype != NULL);
- assert(mesh->self != NULL);
-
- pthread_mutex_lock(&(mesh->mesh_mutex));
+ assert(mesh);
+ assert(mesh->name);
+ assert(mesh->myport);
+ assert(mesh->catta_server);
+ assert(mesh->catta_poll);
+ assert(mesh->catta_servicetype);
+ assert(mesh->self);
logger(mesh, MESHLINK_DEBUG, "Adding service\n");
/* Ifthis is the first time we're called, let's create a new entry group */
- if(!mesh->catta_group) {
- if(!(mesh->catta_group = catta_s_entry_group_new(mesh->catta_server, discovery_entry_group_callback, mesh))) {
- logger(mesh, MESHLINK_ERROR, "catta_entry_group_new() failed: %s\n", catta_strerror(catta_server_errno(mesh->catta_server)));
- goto fail;
- }
- }
-
- /* Create txt records */
- size_t txt_name_len = sizeof(MESHLINK_MDNS_NAME_KEY) + 1 + strlen(mesh->name) + 1;
- txt_name = malloc(txt_name_len);
-
- if(txt_name == NULL) {
- logger(mesh, MESHLINK_ERROR, "Could not allocate memory for TXT record\n");
+ if(!(mesh->catta_group = catta_s_entry_group_new(mesh->catta_server, discovery_entry_group_callback, mesh))) {
+ logger(mesh, MESHLINK_ERROR, "catta_entry_group_new() failed: %s\n", catta_strerror(catta_server_errno(mesh->catta_server)));
goto fail;
}
- snprintf(txt_name, txt_name_len, "%s=%s", MESHLINK_MDNS_NAME_KEY, mesh->name);
-
- char txt_fingerprint[sizeof(MESHLINK_MDNS_FINGERPRINT_KEY) + 1 + MESHLINK_FINGERPRINTLEN + 1];
- snprintf(txt_fingerprint, sizeof(txt_fingerprint), "%s=%s", MESHLINK_MDNS_FINGERPRINT_KEY, meshlink_get_fingerprint(mesh, (meshlink_node_t *)mesh->self));
+ /* Create txt records */
+ fingerprint = meshlink_get_fingerprint(mesh, (meshlink_node_t *)mesh->self);
+ xasprintf(&txt_name, "%s=%s", MESHLINK_MDNS_NAME_KEY, mesh->name);
+ xasprintf(&txt_fingerprint, "%s=%s", MESHLINK_MDNS_FINGERPRINT_KEY, fingerprint);
/* Add the service */
int ret = 0;
- if((ret = catta_server_add_service(mesh->catta_server, mesh->catta_group, CATTA_IF_UNSPEC, CATTA_PROTO_UNSPEC, 0, meshlink_get_fingerprint(mesh, (meshlink_node_t *)mesh->self), mesh->catta_servicetype, NULL, NULL, atoi(mesh->myport), txt_name, txt_fingerprint, NULL)) < 0) {
+ if((ret = catta_server_add_service(mesh->catta_server, mesh->catta_group, CATTA_IF_UNSPEC, CATTA_PROTO_UNSPEC, 0, fingerprint, mesh->catta_servicetype, NULL, NULL, atoi(mesh->myport), txt_name, txt_fingerprint, NULL)) < 0) {
logger(mesh, MESHLINK_ERROR, "Failed to add service: %s\n", catta_strerror(ret));
goto fail;
}
catta_simple_poll_quit(mesh->catta_poll);
done:
-
- if(txt_name) {
- free(txt_name);
- }
-
- pthread_mutex_unlock(&(mesh->mesh_mutex));
+ free(fingerprint);
+ free(txt_name);
+ free(txt_fingerprint);
}
static void discovery_server_callback(CattaServer *server, CattaServerState state, void *userdata) {
(void)server;
meshlink_handle_t *mesh = userdata;
- // asserts
- assert(mesh != NULL);
+ assert(mesh);
switch(state) {
case CATTA_SERVER_RUNNING:
-
/* The serve has startup successfully and registered its host
* name on the network, so it's time to create our services */
+ pthread_mutex_lock(&mesh->mutex);
+
if(!mesh->catta_group) {
discovery_create_services(mesh);
}
+ pthread_mutex_unlock(&mesh->mutex);
+
break;
case CATTA_SERVER_COLLISION: {
- // asserts
- assert(mesh->catta_server != NULL);
- assert(mesh->catta_poll != NULL);
-
/* A host name collision happened. Let's pick a new name for the server */
char hostname[17];
- generate_rand_string(hostname, sizeof(hostname));
+ generate_rand_string(mesh, hostname, sizeof(hostname));
+
+ pthread_mutex_lock(&mesh->mutex);
+
+ assert(mesh->catta_server);
+ assert(mesh->catta_poll);
+
int result = catta_server_set_host_name(mesh->catta_server, hostname);
if(result < 0) {
catta_simple_poll_quit(mesh->catta_poll);
}
+
+ pthread_mutex_unlock(&mesh->mutex);
}
break;
case CATTA_SERVER_REGISTERING:
+ pthread_mutex_lock(&mesh->mutex);
/* Let's drop our registered services. When the server is back
* in CATTA_SERVER_RUNNING state we will register them
mesh->catta_group = NULL;
}
+ pthread_mutex_unlock(&mesh->mutex);
+
break;
case CATTA_SERVER_FAILURE:
- // asserts
- assert(mesh->catta_server != NULL);
- assert(mesh->catta_poll != NULL);
+ pthread_mutex_lock(&mesh->mutex);
+
+ assert(mesh->catta_server);
+ assert(mesh->catta_poll);
/* Terminate on failure */
catta_simple_poll_quit(mesh->catta_poll);
+
+ pthread_mutex_unlock(&mesh->mutex);
break;
case CATTA_SERVER_INVALID:
(void)interface_;
(void)protocol;
(void)flags;
+ (void)name;
+ (void)type;
+ (void)domain;
+ (void)host_name;
+
meshlink_handle_t *mesh = userdata;
- // asserts
- assert(resolver != NULL);
- assert(mesh != NULL);
- assert(mesh->catta_server != NULL);
+ assert(mesh);
- /* Called whenever a service has been resolved successfully or timed out */
- switch(event) {
- case CATTA_RESOLVER_FAILURE:
- // asserts
- assert(name != NULL);
- assert(type != NULL);
- assert(domain != NULL);
- break;
+ if(event != CATTA_RESOLVER_FOUND) {
+ catta_s_service_resolver_free(resolver);
+ return;
+ }
- case CATTA_RESOLVER_FOUND: {
- // asserts
- assert(name != NULL);
- assert(type != NULL);
- assert(domain != NULL);
- assert(host_name != NULL);
- assert(address != NULL);
- assert(txt != NULL);
+ // retrieve fingerprint
+ CattaStringList *node_name_li = catta_string_list_find(txt, MESHLINK_MDNS_NAME_KEY);
+ CattaStringList *node_fp_li = catta_string_list_find(txt, MESHLINK_MDNS_FINGERPRINT_KEY);
- // retrieve fingerprint
- CattaStringList *node_name_li = catta_string_list_find(txt, MESHLINK_MDNS_NAME_KEY);
- CattaStringList *node_fp_li = catta_string_list_find(txt, MESHLINK_MDNS_FINGERPRINT_KEY);
+ if(node_name_li && node_fp_li) {
+ char *node_name = (char *)catta_string_list_get_text(node_name_li) + strlen(MESHLINK_MDNS_NAME_KEY);
+ char *node_fp = (char *)catta_string_list_get_text(node_fp_li) + strlen(MESHLINK_MDNS_FINGERPRINT_KEY);
- if(node_name_li != NULL && node_fp_li != NULL) {
- char *node_name = (char *)catta_string_list_get_text(node_name_li) + strlen(MESHLINK_MDNS_NAME_KEY);
- char *node_fp = (char *)catta_string_list_get_text(node_fp_li) + strlen(MESHLINK_MDNS_FINGERPRINT_KEY);
+ if(node_name[0] == '=' && node_fp[0] == '=') {
+ pthread_mutex_lock(&mesh->mutex);
- if(node_name[0] == '=' && node_fp[0] == '=') {
- pthread_mutex_lock(&(mesh->mesh_mutex));
+ node_name += 1;
- node_name += 1;
- node_fp += 1;
+ meshlink_node_t *node = meshlink_get_node(mesh, node_name);
- meshlink_node_t *node = meshlink_get_node(mesh, node_name);
+ if(node) {
+ logger(mesh, MESHLINK_INFO, "Node %s is part of the mesh network.\n", node->name);
- if(node != NULL) {
- logger(mesh, MESHLINK_INFO, "Node %s is part of the mesh network.\n", node->name);
+ sockaddr_t naddress;
+ memset(&naddress, 0, sizeof(naddress));
- sockaddr_t naddress;
- memset(&naddress, 0, sizeof(naddress));
+ switch(address->proto) {
+ case CATTA_PROTO_INET: {
+ naddress.in.sin_family = AF_INET;
+ naddress.in.sin_port = htons(port);
+ naddress.in.sin_addr.s_addr = address->data.ipv4.address;
+ }
+ break;
- switch(address->proto) {
- case CATTA_PROTO_INET: {
- naddress.in.sin_family = AF_INET;
- naddress.in.sin_port = htons(port);
- naddress.in.sin_addr.s_addr = address->data.ipv4.address;
- }
- break;
+ case CATTA_PROTO_INET6: {
+ naddress.in6.sin6_family = AF_INET6;
+ naddress.in6.sin6_port = htons(port);
+ memcpy(naddress.in6.sin6_addr.s6_addr, address->data.ipv6.address, sizeof(naddress.in6.sin6_addr.s6_addr));
+ }
+ break;
- case CATTA_PROTO_INET6: {
- naddress.in6.sin6_family = AF_INET6;
- naddress.in6.sin6_port = htons(port);
- memcpy(naddress.in6.sin6_addr.s6_addr, address->data.ipv6.address, sizeof(naddress.in6.sin6_addr.s6_addr));
- }
+ default:
+ naddress.unknown.family = AF_UNKNOWN;
break;
+ }
- default:
- naddress.unknown.family = AF_UNKNOWN;
- break;
- }
+ if(naddress.unknown.family != AF_UNKNOWN) {
+ node_t *n = (node_t *)node;
+ connection_t *c = n->connection;
- if(naddress.unknown.family != AF_UNKNOWN) {
- meshlink_hint_address(mesh, (meshlink_node_t *)node, (struct sockaddr *)&naddress);
- } else {
- logger(mesh, MESHLINK_WARNING, "Could not resolve node %s to a known address family type.\n", node->name);
+ node_add_recent_address(mesh, n, &naddress);
+
+ if(c && c->outgoing && !c->status.active) {
+ c->outgoing->timeout = 0;
+
+ if(c->outgoing->ev.cb) {
+ timeout_set(&mesh->loop, &c->outgoing->ev, &(struct timespec) {
+ 0, 0
+ });
+ }
+
+ c->last_ping_time = 0;
}
+
} else {
- logger(mesh, MESHLINK_WARNING, "Node %s is not part of the mesh network.\n", node_name);
+ logger(mesh, MESHLINK_WARNING, "Could not resolve node %s to a known address family type.\n", node->name);
}
-
- pthread_mutex_unlock(&(mesh->mesh_mutex));
+ } else {
+ logger(mesh, MESHLINK_WARNING, "Node %s is not part of the mesh network.\n", node_name);
}
+
+ pthread_mutex_unlock(&mesh->mutex);
}
}
- break;
- }
catta_s_service_resolver_free(resolver);
}
(void)flags;
meshlink_handle_t *mesh = userdata;
- // asserts
- assert(mesh != NULL);
- assert(mesh->catta_server != NULL);
- assert(mesh->catta_poll != NULL);
-
/* Called whenever a new services becomes available on the LAN or is removed from the LAN */
switch(event) {
case CATTA_BROWSER_FAILURE:
+ pthread_mutex_lock(&mesh->mutex);
catta_simple_poll_quit(mesh->catta_poll);
+ pthread_mutex_unlock(&mesh->mutex);
break;
case CATTA_BROWSER_NEW:
+ pthread_mutex_lock(&mesh->mutex);
catta_s_service_resolver_new(mesh->catta_server, interface_, protocol, name, type, domain, CATTA_PROTO_UNSPEC, 0, discovery_resolve_callback, mesh);
+ handle_network_change(mesh, ++mesh->catta_interfaces);
+ pthread_mutex_unlock(&mesh->mutex);
break;
case CATTA_BROWSER_REMOVE:
+ pthread_mutex_lock(&mesh->mutex);
+ handle_network_change(mesh, --mesh->catta_interfaces);
+ pthread_mutex_unlock(&mesh->mutex);
+ break;
+
case CATTA_BROWSER_ALL_FOR_NOW:
case CATTA_BROWSER_CACHE_EXHAUSTED:
break;
}
}
-static void *discovery_loop(void *userdata) {
- meshlink_handle_t *mesh = userdata;
-
- // asserts
- assert(mesh != NULL);
- assert(mesh->catta_poll != NULL);
-
- catta_simple_poll_loop(mesh->catta_poll);
-
- return NULL;
-}
-
static void discovery_log_cb(CattaLogLevel level, const char *txt) {
meshlink_log_level_t mlevel = MESHLINK_CRITICAL;
logger(NULL, mlevel, "%s\n", txt);
}
-bool discovery_start(meshlink_handle_t *mesh) {
- logger(mesh, MESHLINK_DEBUG, "discovery_start called\n");
-
- // asserts
- assert(mesh != NULL);
- assert(mesh->catta_poll == NULL);
- assert(mesh->catta_server == NULL);
- assert(mesh->catta_browser == NULL);
- assert(mesh->discovery_threadstarted == false);
- assert(mesh->catta_servicetype == NULL);
+static void *discovery_loop(void *userdata) {
+ bool status = false;
+ meshlink_handle_t *mesh = userdata;
+ assert(mesh);
// handle catta logs
catta_set_log_function(discovery_log_cb);
// create service type string
- size_t servicetype_strlen = sizeof(MESHLINK_MDNS_SERVICE_TYPE) + strlen(mesh->appname) + 1;
+ char appname[strlen(mesh->appname) + 2];
+ strcpy(appname, mesh->appname);
+
+ for(char *p = appname; *p; p++) {
+ if(!isalnum(*p) && *p != '_' && *p != '-') {
+ *p = '_';
+ }
+ }
+
+ if(!appname[1]) {
+ appname[1] = '_';
+ appname[2] = '\0';
+ }
+
+ size_t servicetype_strlen = sizeof(MESHLINK_MDNS_SERVICE_TYPE) + strlen(appname) + 1;
mesh->catta_servicetype = malloc(servicetype_strlen);
if(mesh->catta_servicetype == NULL) {
goto fail;
}
- snprintf(mesh->catta_servicetype, servicetype_strlen, MESHLINK_MDNS_SERVICE_TYPE, mesh->appname);
+ snprintf(mesh->catta_servicetype, servicetype_strlen, MESHLINK_MDNS_SERVICE_TYPE, appname);
// Allocate discovery loop object
if(!(mesh->catta_poll = catta_simple_poll_new())) {
// generate some unique host name (we actually do not care about it)
char hostname[17];
- generate_rand_string(hostname, sizeof(hostname));
+ generate_rand_string(mesh, hostname, sizeof(hostname));
// Let's set the host name for this server.
CattaServerConfig config;
/* Free the configuration data */
catta_server_config_free(&config);
- /* Check wether creating the server object succeeded */
+ /* Check whether creating the server object succeeded */
if(!mesh->catta_server) {
logger(mesh, MESHLINK_ERROR, "Failed to create discovery server: %s\n", catta_strerror(error));
goto fail;
goto fail;
}
- // Start the discovery thread
- if(pthread_create(&mesh->discovery_thread, NULL, discovery_loop, mesh) != 0) {
- logger(mesh, MESHLINK_ERROR, "Could not start discovery thread: %s\n", strerror(errno));
- memset(&mesh->discovery_thread, 0, sizeof(mesh)->discovery_thread);
- goto fail;
- }
+ status = true;
- mesh->discovery_threadstarted = true;
+fail:
- return true;
+ pthread_mutex_lock(&mesh->discovery_mutex);
+ pthread_cond_broadcast(&mesh->discovery_cond);
+ pthread_mutex_unlock(&mesh->discovery_mutex);
-fail:
+ if(status) {
+ catta_simple_poll_loop(mesh->catta_poll);
+ }
- if(mesh->catta_browser != NULL) {
+ if(mesh->catta_browser) {
catta_s_service_browser_free(mesh->catta_browser);
mesh->catta_browser = NULL;
}
- if(mesh->catta_server != NULL) {
+ if(mesh->catta_group) {
+ catta_s_entry_group_reset(mesh->catta_group);
+ catta_s_entry_group_free(mesh->catta_group);
+ mesh->catta_group = NULL;
+ }
+
+ if(mesh->catta_server) {
catta_server_free(mesh->catta_server);
mesh->catta_server = NULL;
}
- if(mesh->catta_poll != NULL) {
+ if(mesh->catta_poll) {
catta_simple_poll_free(mesh->catta_poll);
mesh->catta_poll = NULL;
}
- if(mesh->catta_servicetype != NULL) {
+ if(mesh->catta_servicetype) {
free(mesh->catta_servicetype);
mesh->catta_servicetype = NULL;
}
- return false;
+ return NULL;
+}
+
+bool discovery_start(meshlink_handle_t *mesh) {
+ logger(mesh, MESHLINK_DEBUG, "discovery_start called\n");
+
+ assert(mesh);
+ assert(!mesh->catta_poll);
+ assert(!mesh->catta_server);
+ assert(!mesh->catta_browser);
+ assert(!mesh->discovery_threadstarted);
+ assert(!mesh->catta_servicetype);
+
+ // Start the discovery thread
+ if(pthread_create(&mesh->discovery_thread, NULL, discovery_loop, mesh) != 0) {
+ logger(mesh, MESHLINK_ERROR, "Could not start discovery thread: %s\n", strerror(errno));
+ memset(&mesh->discovery_thread, 0, sizeof(mesh)->discovery_thread);
+ return false;
+ }
+
+ pthread_mutex_lock(&mesh->discovery_mutex);
+ pthread_cond_wait(&mesh->discovery_cond, &mesh->discovery_mutex);
+ pthread_mutex_unlock(&mesh->discovery_mutex);
+
+ mesh->discovery_threadstarted = true;
+
+ return true;
}
void discovery_stop(meshlink_handle_t *mesh) {
logger(mesh, MESHLINK_DEBUG, "discovery_stop called\n");
- // asserts
- assert(mesh != NULL);
+ assert(mesh);
// Shut down
if(mesh->catta_poll) {
mesh->discovery_threadstarted = false;
}
- // Clean up resources
- if(mesh->catta_browser != NULL) {
- catta_s_service_browser_free(mesh->catta_browser);
- mesh->catta_browser = NULL;
- }
-
- if(mesh->catta_group) {
- catta_s_entry_group_reset(mesh->catta_group);
- catta_s_entry_group_free(mesh->catta_group);
- mesh->catta_group = NULL;
- }
-
- if(mesh->catta_server != NULL) {
- catta_server_free(mesh->catta_server);
- mesh->catta_server = NULL;
- }
-
- if(mesh->catta_poll != NULL) {
- catta_simple_poll_free(mesh->catta_poll);
- mesh->catta_poll = NULL;
- }
-
- if(mesh->catta_servicetype != NULL) {
- free(mesh->catta_servicetype);
- mesh->catta_servicetype = NULL;
- }
+ mesh->catta_interfaces = 0;
}
projects / meshlink / blobdiff