Make tinc --batch --force join enable the tinc-up script.

[tinc] / src / invitation.c

diff --git a/src/invitation.c b/src/invitation.c
index 35f236e..2f28aef 100644 (file)
--- a/src/invitation.c
+++ b/src/invitation.c
@@ -987,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) {
@@ -1049,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.
@@ -1071,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;
@@ -1319,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;
                }