X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fprotocol_auth.c;h=0a107e4c2820f19caa88dea3c6e5f41cab3f99c9;hb=fa90b359694a0b3aa967dec97b1286e0dd695a78;hp=1f2e24a2ce8d9d6def723ee1a851ac4b5928ccef;hpb=a23ddd4f4e273b2ed68fe173b4faa69aadc98756;p=meshlink

diff --git a/src/protocol_auth.c b/src/protocol_auth.c
index 1f2e24a2..0a107e4c 100644
--- a/src/protocol_auth.c
+++ b/src/protocol_auth.c
@@ -44,7 +44,7 @@
 extern bool node_write_devclass(meshlink_handle_t *mesh, node_t *n);
 
 bool send_id(meshlink_handle_t *mesh, connection_t *c) {
-	return send_request(mesh, c, NULL, "%d %s %d.%d %s", ID, mesh->self->name, PROT_MAJOR, PROT_MINOR, mesh->appname);
+	return send_request(mesh, c, NULL, "%d %s %d.%d %s %u", ID, mesh->self->name, PROT_MAJOR, PROT_MINOR, mesh->appname, 0);
 }
 
 static bool commit_invitation(meshlink_handle_t *mesh, connection_t *c, const void *data) {
@@ -71,7 +71,7 @@ static bool commit_invitation(meshlink_handle_t *mesh, connection_t *c, const vo
 	// Remember its current address
 	node_add_recent_address(mesh, n, &c->address);
 
-	if(!node_write_config(mesh, n) || !config_sync(mesh, "current")) {
+	if(!node_write_config(mesh, n, true) || !config_sync(mesh, "current")) {
 		logger(mesh, MESHLINK_ERROR, "Error writing configuration file for invited node %s!\n", c->name);
 		free_node(n);
 		return false;
@@ -188,7 +188,7 @@ bool id_h(meshlink_handle_t *mesh, connection_t *c, const char *request) {
 
 	char name[MAX_STRING_SIZE];
 
-	if(sscanf(request, "%*d " MAX_STRING " %d.%d", name, &c->protocol_major, &c->protocol_minor) < 2) {
+	if(sscanf(request, "%*d " MAX_STRING " %d.%d %*s %u", name, &c->protocol_major, &c->protocol_minor, &c->flags) < 2) {
 		logger(mesh, MESHLINK_ERROR, "Got bad %s from %s", "ID", c->name);
 		return false;
 	}
@@ -296,10 +296,13 @@ bool id_h(meshlink_handle_t *mesh, connection_t *c, const char *request) {
 		snprintf(label, sizeof(label), "%s %s %s", meshlink_tcp_label, c->name, mesh->self->name);
 	}
 
-	char buf1[1024], buf2[1024];
-	bin2hex((uint8_t *)mesh->private_key + 64, buf1, 32);
-	bin2hex((uint8_t *)n->ecdsa + 64, buf2, 32);
-	logger(mesh, MESHLINK_DEBUG, "Connection to %s mykey %s hiskey %s", c->name, buf1, buf2);
+	if(mesh->log_level <= MESHLINK_DEBUG) {
+		char buf1[1024], buf2[1024];
+		bin2hex((uint8_t *)mesh->private_key + 64, buf1, 32);
+		bin2hex((uint8_t *)n->ecdsa + 64, buf2, 32);
+		logger(mesh, MESHLINK_DEBUG, "Connection to %s mykey %s hiskey %s", c->name, buf1, buf2);
+	}
+
 	return sptps_start(&c->sptps, c, c->outgoing, false, mesh->private_key, n->ecdsa, label, sizeof(label) - 1, send_meta_sptps, receive_meta_sptps);
 }
 
@@ -355,7 +358,7 @@ bool ack_h(meshlink_handle_t *mesh, connection_t *c, const char *request) {
 	} else {
 		if(n->connection) {
 			/* Oh dear, we already have a connection to this node. */
-			logger(mesh, MESHLINK_DEBUG, "Established a second connection with %s, closing old connection", n->connection->name);
+			logger(mesh, MESHLINK_INFO, "Established a second connection with %s, closing old connection", n->connection->name);
 
 			if(n->connection->outgoing) {
 				if(c->outgoing) {
@@ -377,6 +380,7 @@ bool ack_h(meshlink_handle_t *mesh, connection_t *c, const char *request) {
 
 	n->devclass = devclass;
 	n->status.dirty = true;
+	n->status.tiny = c->flags & PROTOCOL_TINY;
 
 	n->last_successfull_connection = mesh->loop.now.tv_sec;
 
@@ -417,7 +421,9 @@ bool ack_h(meshlink_handle_t *mesh, connection_t *c, const char *request) {
 
 	/* Send him everything we know */
 
-	send_everything(mesh, c);
+	if(!(c->flags & PROTOCOL_TINY)) {
+		send_everything(mesh, c);
+	}
 
 	/* Create an edge_t for this connection */