X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fmeshlink.c;h=f949c2c7da8df9acd9999418c79cf4a736635ada;hb=e40d5bf3a0e030105334046319f377efbf3f06c4;hp=340b6041cfee81d7f7ef641ec55794dae6c1e5f0;hpb=ee00033298d347b3da13dfca0d18db1c897953e1;p=meshlink

diff --git a/src/meshlink.c b/src/meshlink.c
index 340b6041..f949c2c7 100644
--- a/src/meshlink.c
+++ b/src/meshlink.c
@@ -829,7 +829,7 @@ static bool finalize_join(join_state_t *state, const void *buf, uint16_t len) {
 	}
 
 	/* Ensure the configuration directory metadata is on disk */
-	if(!config_sync(mesh, "current") || !sync_path(mesh->confbase)) {
+	if(!config_sync(mesh, "current") || (mesh->confbase && !sync_path(mesh->confbase))) {
 		return false;
 	}
 
@@ -1713,6 +1713,11 @@ bool meshlink_start(meshlink_handle_t *mesh) {
 		return false;
 	}
 
+	// Reset node connection timers
+	for splay_each(node_t, n, mesh->nodes) {
+		n->last_connect_try = 0;
+	}
+
 	// TODO: open listening sockets first
 
 	//Check that a valid name is set
@@ -3621,7 +3626,12 @@ static bool channel_pre_accept(struct utcp *utcp, uint16_t port) {
 	(void)port;
 	node_t *n = utcp->priv;
 	meshlink_handle_t *mesh = n->mesh;
-	return mesh->channel_accept_cb;
+
+	if(mesh->channel_accept_cb && mesh->channel_listen_cb) {
+		return mesh->channel_listen_cb(mesh, (meshlink_node_t *)n, port);
+	} else {
+		return mesh->channel_accept_cb;
+	}
 }
 
 /* Finish one AIO buffer, return true if the channel is still open. */
@@ -3926,6 +3936,21 @@ void meshlink_set_channel_poll_cb(meshlink_handle_t *mesh, meshlink_channel_t *c
 	pthread_mutex_unlock(&mesh->mutex);
 }
 
+void meshlink_set_channel_listen_cb(meshlink_handle_t *mesh, meshlink_channel_listen_cb_t cb) {
+	if(!mesh) {
+		meshlink_errno = MESHLINK_EINVAL;
+		return;
+	}
+
+	if(pthread_mutex_lock(&mesh->mutex) != 0) {
+		abort();
+	}
+
+	mesh->channel_listen_cb = cb;
+
+	pthread_mutex_unlock(&mesh->mutex);
+}
+
 void meshlink_set_channel_accept_cb(meshlink_handle_t *mesh, meshlink_channel_accept_cb_t cb) {
 	if(!mesh) {
 		meshlink_errno = MESHLINK_EINVAL;