X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Finvitation.c;h=0dfd9eacf32f2cae5ab9a3a45256f74551af3c72;hb=af81c436d6e11a53803747af7cc8ecfd449ccd4c;hp=ff93f9ee3110928f1b49531082ded734ed319126;hpb=5cbef906209eb5005f821af8f55a6f5d7e7d060c;p=tinc

diff --git a/src/invitation.c b/src/invitation.c
index ff93f9ee..0dfd9eac 100644
--- a/src/invitation.c
+++ b/src/invitation.c
@@ -252,14 +252,14 @@ int cmd_invite(int argc, char *argv[]) {
 	}
 
 	// If a daemon is running, ensure no other nodes know about this name
-	bool found = false;
 	if(connect_tincd(false)) {
+		bool found = false;
 		sendline(fd, "%d %d", CONTROL, REQ_DUMP_NODES);
 
 		while(recvline(fd, line, sizeof line)) {
 			char node[4096];
 			int code, req;
-			if(sscanf(line, "%d %d %s", &code, &req, node) != 3)
+			if(sscanf(line, "%d %d %4095s", &code, &req, node) != 3)
 				break;
 			if(!strcmp(node, argv[1]))
 				found = true;
@@ -607,6 +607,17 @@ make_names:
 		return false;
 	}
 
+	snprintf(filename, sizeof filename, "%s" SLASH "invitation-data", confbase);
+	FILE *finv = fopen(filename, "w");
+	if(!finv || fwrite(data, datalen, 1, finv) != 1) {
+		fprintf(stderr, "Could not create file %s: %s\n", filename, strerror(errno));
+		fclose(fh);
+		fclose(f);
+		fclose(finv);
+		return false;
+	}
+	fclose(finv);
+
 	snprintf(filename, sizeof filename, "%s" SLASH "tinc-up.invitation", confbase);
 	FILE *fup = fopen(filename, "w");
 	if(!fup) {
@@ -686,7 +697,7 @@ make_names:
 		}
 
 		// Copy the safe variable to the right config file
-		fprintf(variables[i].type & VAR_HOST ? fh : f, "%s = %s\n", l, value);
+		fprintf((variables[i].type & VAR_HOST) ? fh : f, "%s = %s\n", l, value);
 	}
 
 	fclose(f);
@@ -1044,7 +1055,7 @@ next:
 	char hisname[4096] = "";
 	int code, hismajor, hisminor = 0;
 
-	if(!recvline(sock, line, sizeof line) || sscanf(line, "%d %s %d.%d", &code, hisname, &hismajor, &hisminor) < 3 || code != 0 || hismajor != PROT_MAJOR || !check_id(hisname) || !recvline(sock, line, sizeof line) || !rstrip(line) || sscanf(line, "%d ", &code) != 1 || code != ACK || strlen(line) < 3) {
+	if(!recvline(sock, line, sizeof line) || sscanf(line, "%d %4095s %d.%d", &code, hisname, &hismajor, &hisminor) < 3 || code != 0 || hismajor != PROT_MAJOR || !check_id(hisname) || !recvline(sock, line, sizeof line) || !rstrip(line) || sscanf(line, "%d ", &code) != 1 || code != ACK || strlen(line) < 3) {
 		fprintf(stderr, "Cannot read greeting from peer\n");
 		closesocket(sock);
 		goto next;