X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fmeshlink.c;h=0318a497ba98bc4a30549898c72ccbd19b12ef81;hb=947f09ff2c507a80bbe7f92ed0d41b06c98d5375;hp=e82ea4f11a384f639f3c6298a42bfa15aecf3e8a;hpb=03ab29c1e6e1b608311decb6630eb0a2177ce1dd;p=meshlink

diff --git a/src/meshlink.c b/src/meshlink.c
index e82ea4f1..0318a497 100644
--- a/src/meshlink.c
+++ b/src/meshlink.c
@@ -889,6 +889,7 @@ static bool meshlink_setup(meshlink_handle_t *mesh) {
 	mesh->self->name = xstrdup(mesh->name);
 	mesh->self->devclass = mesh->devclass;
 	mesh->self->ecdsa = ecdsa_set_public_key(ecdsa_get_public_key(mesh->private_key));
+	mesh->self->session_id = mesh->session_id;
 
 	if(!write_main_config_files(mesh)) {
 		logger(mesh, MESHLINK_ERROR, "Could not write main config files into %s/current: %s\n", mesh->confbase, strerror(errno));
@@ -967,6 +968,7 @@ static bool meshlink_read_config(meshlink_handle_t *mesh) {
 	mesh->self = new_node();
 	mesh->self->name = xstrdup(name);
 	mesh->self->devclass = mesh->devclass;
+	mesh->self->session_id = mesh->session_id;
 
 	if(!node_read_public_key(mesh, mesh->self)) {
 		logger(NULL, MESHLINK_ERROR, "Could not read our host configuration file!");
@@ -1288,6 +1290,10 @@ meshlink_handle_t *meshlink_open_ex(const meshlink_open_params_t *params) {
 
 	randomize(&mesh->prng_state, sizeof(mesh->prng_state));
 
+	do {
+		randomize(&mesh->session_id, sizeof(mesh->session_id));
+	} while(mesh->session_id == 0);
+
 	memcpy(mesh->dev_class_traits, default_class_traits, sizeof(default_class_traits));
 
 	if(usingname) {
@@ -2221,6 +2227,7 @@ bool meshlink_set_port(meshlink_handle_t *mesh, int port) {
 	mesh->self = new_node();
 	mesh->self->name = xstrdup(mesh->name);
 	mesh->self->devclass = mesh->devclass;
+	mesh->self->session_id = mesh->session_id;
 	xasprintf(&mesh->myport, "%d", port);
 
 	if(!node_read_public_key(mesh, mesh->self)) {
@@ -3150,7 +3157,7 @@ void meshlink_set_channel_rcvbuf(meshlink_handle_t *mesh, meshlink_channel_t *ch
 }
 
 meshlink_channel_t *meshlink_channel_open_ex(meshlink_handle_t *mesh, meshlink_node_t *node, uint16_t port, meshlink_channel_receive_cb_t cb, const void *data, size_t len, uint32_t flags) {
-	if(data || len) {
+	if(data && len) {
 		abort();        // TODO: handle non-NULL data
 	}
 
@@ -3183,6 +3190,11 @@ meshlink_channel_t *meshlink_channel_open_ex(meshlink_handle_t *mesh, meshlink_n
 	meshlink_channel_t *channel = xzalloc(sizeof(*channel));
 	channel->node = n;
 	channel->receive_cb = cb;
+
+	if(data && !len) {
+		channel->priv = (void *)data;
+	}
+
 	channel->c = utcp_connect_ex(n->utcp, port, channel_recv, channel, flags);
 
 	pthread_mutex_unlock(&mesh->mutex);