X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Finvitation.c;h=2f28aef492c29eb3e0d126785f15d72e2c9807d0;hb=252b8f0c9f3851c59f8baec5df95bbb2bbf85e72;hp=500f2434b77e150a0d2f566e2fa89e6693d13380;hpb=1c475ecb575367a6b3f9328b0f643ad636155341;p=tinc

diff --git a/src/invitation.c b/src/invitation.c
index 500f2434..2f28aef4 100644
--- a/src/invitation.c
+++ b/src/invitation.c
@@ -836,8 +836,12 @@ make_names:
 			fprintf(stderr, "Ignoring unknown variable '%s' in invitation.\n", l);
 			continue;
 		} else if(!(variables[i].type & VAR_SAFE)) {
-			fprintf(stderr, "Ignoring unsafe variable '%s' in invitation.\n", l);
-			continue;
+			if(force) {
+				fprintf(stderr, "Warning: unsafe variable '%s' in invitation.\n", l);
+			} else {
+				fprintf(stderr, "Ignoring unsafe variable '%s' in invitation.\n", l);
+				continue;
+			}
 		}
 
 		// Copy the safe variable to the right config file
@@ -983,7 +987,12 @@ ask_netname:
 
 	char filename2[PATH_MAX];
 	snprintf(filename, sizeof(filename), "%s" SLASH "tinc-up.invitation", confbase);
+
+#ifdef HAVE_MINGW
+	snprintf(filename2, sizeof(filename2), "%s" SLASH "tinc-up.bat", confbase);
+#else
 	snprintf(filename2, sizeof(filename2), "%s" SLASH "tinc-up", confbase);
+#endif
 
 	if(valid_tinc_up) {
 		if(tty) {
@@ -1013,10 +1022,14 @@ ask_netname:
 					char *command;
 #ifndef HAVE_MINGW
 					const char *editor = getenv("VISUAL");
-					if (!editor)
+
+					if(!editor) {
 						editor = getenv("EDITOR");
-					if (!editor)
+					}
+
+					if(!editor) {
 						editor = "vi";
+					}
 
 					xasprintf(&command, "\"%s\" \"%s\"", editor, filename);
 #else
@@ -1041,7 +1054,13 @@ ask_netname:
 				}
 			}
 		} else {
-			fprintf(stderr, "A tinc-up script was generated, but has been left disabled.\n");
+			if(force) {
+				rename(filename, filename2);
+				chmod(filename2, 0755);
+				fprintf(stderr, "tinc-up enabled.\n");
+			} else {
+				fprintf(stderr, "A tinc-up script was generated, but has been left disabled.\n");
+			}
 		}
 	} else {
 		// A placeholder was generated.
@@ -1063,7 +1082,7 @@ static bool invitation_send(void *handle, uint8_t type, const void *vdata, size_
 	while(len) {
 		int result = send(sock, data, len, 0);
 
-		if(result == -1 && errno == EINTR) {
+		if(result == -1 && sockwouldblock(sockerrno)) {
 			continue;
 		} else if(result <= 0) {
 			return false;
@@ -1311,11 +1330,21 @@ next:
 
 	while((len = recv(sock, line, sizeof(line), 0))) {
 		if(len < 0) {
-			if(errno == EINTR) {
+			if(sockwouldblock(sockerrno)) {
 				continue;
 			}
 
-			fprintf(stderr, "Error reading data from %s port %s: %s\n", address, port, strerror(errno));
+#if HAVE_MINGW
+
+			// If socket has been shut down, recv() on Windows returns -1 and sets sockerrno
+			// to WSAESHUTDOWN, while on UNIX-like operating systems recv() returns 0, so we
+			// have to do an explicit check here.
+			if(sockshutdown(sockerrno)) {
+				break;
+			}
+
+#endif
+			fprintf(stderr, "Error reading data from %s port %s: %s\n", address, port, sockstrerror(sockerrno));
 			return 1;
 		}