X-Git-Url: http://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Finvitation.c;h=d83e137839b372a6cf803cc1410b2455a7f42bc6;hb=e994222a4370621a9ac69c13ed23531c1eaa6809;hp=151f701b55247a545055e356146f77bff298e1b6;hpb=c5373d9fc0c8e3dfb6529b35bf44efe58410e0c7;p=tinc

diff --git a/src/invitation.c b/src/invitation.c
index 151f701b..d83e1378 100644
--- a/src/invitation.c
+++ b/src/invitation.c
@@ -36,6 +36,7 @@
 #include "xalloc.h"
 #include "random.h"
 #include "pidfile.h"
+#include "fs.h"
 
 #include "ed25519/sha512.h"
 
@@ -333,6 +334,11 @@ int cmd_invite(int argc, char *argv[]) {
 		return 1;
 	}
 
+	if(argc > 2) {
+		fprintf(stderr, "Too many arguments!\n");
+		return 1;
+	}
+
 	// Check validity of the new node's name
 	if(!check_id(argv[1])) {
 		fprintf(stderr, "Invalid name for node.\n");
@@ -379,13 +385,12 @@ int cmd_invite(int argc, char *argv[]) {
 		}
 	}
 
-	snprintf(filename, sizeof(filename), "%s" SLASH "invitations", confbase);
-
-	if(mkdir(filename, 0700) && errno != EEXIST) {
-		fprintf(stderr, "Could not create directory %s: %s\n", filename, strerror(errno));
-		return 1;
+	if(!makedirs(DIR_INVITATIONS)) {
+		return false;
 	}
 
+	snprintf(filename, sizeof(filename), "%s" SLASH "invitations", confbase);
+
 	// Count the number of valid invitations, clean up old ones
 	DIR *dir = opendir(filename);
 
@@ -774,13 +779,7 @@ make_names:
 		goto make_names;
 	}
 
-	if(mkdir(confbase, 0777) && errno != EEXIST) {
-		fprintf(stderr, "Could not create directory %s: %s\n", confbase, strerror(errno));
-		return false;
-	}
-
-	if(mkdir(hosts_dir, 0777) && errno != EEXIST) {
-		fprintf(stderr, "Could not create directory %s: %s\n", hosts_dir, strerror(errno));
+	if(!makedirs(DIR_HOSTS | DIR_CONFBASE | DIR_CACHE)) {
 		return false;
 	}
 
@@ -1208,14 +1207,8 @@ int cmd_join(int argc, char *argv[]) {
 	}
 
 	// Make sure confbase exists and is accessible.
-	if(!confbase_given && mkdir(confdir, 0755) && errno != EEXIST) {
-		fprintf(stderr, "Could not create directory %s: %s\n", confdir, strerror(errno));
-		return 1;
-	}
-
-	if(mkdir(confbase, 0777) && errno != EEXIST) {
-		fprintf(stderr, "Could not create directory %s: %s\n", confbase, strerror(errno));
-		return 1;
+	if(!makedirs(DIR_CONFDIR | DIR_CONFBASE)) {
+		return false;
 	}
 
 	if(access(confbase, R_OK | W_OK | X_OK)) {
@@ -1243,7 +1236,7 @@ int cmd_join(int argc, char *argv[]) {
 
 		if(!fgets(line, sizeof(line), stdin)) {
 			fprintf(stderr, "Error while reading stdin: %s\n", strerror(errno));
-			return false;
+			return 1;
 		}
 
 		invitation = line;
@@ -1404,7 +1397,16 @@ next:
 	}
 
 	// Start an SPTPS session
-	if(!sptps_start(&sptps, NULL, true, false, key, hiskey, "tinc invitation", 15, invitation_send, invitation_receive)) {
+	sptps_params_t params = {
+		.initiator = true,
+		.mykey = key,
+		.hiskey = hiskey,
+		.label = "tinc invitation",
+		.send_data = invitation_send,
+		.receive_record = invitation_receive,
+	};
+
+	if(!sptps_start(&sptps, &params)) {
 		ecdsa_free(hiskey);
 		ecdsa_free(key);
 		return 1;