X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fmeshlink.c;h=07c518e0dd8c8c112aea2f85a84a756947998005;hb=18c0a32a4de44adfeee6be42d1c1ae231d093cbf;hp=eb9142cc743d842c7f8967e0b9a4408aa170113e;hpb=543a5ecbb12d13350a345044632a6b6d04f3d640;p=meshlink

diff --git a/src/meshlink.c b/src/meshlink.c
index eb9142cc..07c518e0 100644
--- a/src/meshlink.c
+++ b/src/meshlink.c
@@ -743,6 +743,10 @@ static bool finalize_join(join_state_t *state, const void *buf, uint16_t len) {
 		return false;
 	}
 
+	if(!mesh->inviter_commits_first) {
+		devtool_set_inviter_commits_first(false);
+	}
+
 	sptps_send_record(&state->sptps, 1, ecdsa_get_public_key(mesh->private_key), 32);
 
 	logger(mesh, MESHLINK_DEBUG, "Configuration stored in: %s\n", mesh->confbase);
@@ -775,21 +779,44 @@ static bool invitation_receive(void *handle, uint8_t type, const void *msg, uint
 	join_state_t *state = handle;
 	meshlink_handle_t *mesh = state->mesh;
 
-	switch(type) {
-	case SPTPS_HANDSHAKE:
-		return sptps_send_record(&state->sptps, 0, state->cookie, 18);
+	if(mesh->inviter_commits_first) {
+		switch(type) {
+		case SPTPS_HANDSHAKE:
+			return sptps_send_record(&state->sptps, 2, state->cookie, 18 + 32);
 
-	case 0:
-		return finalize_join(state, msg, len);
+		case 1:
+			break;
 
-	case 1:
-		logger(mesh, MESHLINK_DEBUG, "Invitation successfully accepted.\n");
-		shutdown(state->sock, SHUT_RDWR);
-		state->success = true;
-		break;
+		case 0:
+			if(!finalize_join(state, msg, len)) {
+				return false;
+			}
 
-	default:
-		return false;
+			logger(mesh, MESHLINK_DEBUG, "Invitation successfully accepted.\n");
+			shutdown(state->sock, SHUT_RDWR);
+			state->success = true;
+			break;
+
+		default:
+			return false;
+		}
+	} else {
+		switch(type) {
+		case SPTPS_HANDSHAKE:
+			return sptps_send_record(&state->sptps, 0, state->cookie, 18);
+
+		case 0:
+			return finalize_join(state, msg, len);
+
+		case 1:
+			logger(mesh, MESHLINK_DEBUG, "Invitation successfully accepted.\n");
+			shutdown(state->sock, SHUT_RDWR);
+			state->success = true;
+			break;
+
+		default:
+			return false;
+		}
 	}
 
 	return true;
@@ -2647,6 +2674,10 @@ bool meshlink_join(meshlink_handle_t *mesh, const char *invitation) {
 		goto invalid;
 	}
 
+	if(mesh->inviter_commits_first) {
+		memcpy(state.cookie + 18, ecdsa_get_public_key(mesh->private_key), 32);
+	}
+
 	// Generate a throw-away key for the invitation.
 	key = ecdsa_generate();