scan_for_hostname(tinc_conf, &hostname, &port);
}
+ free(name);
+ name = NULL;
+
if(hostname) {
goto done;
}
if(!f) {
fprintf(stderr, "Could not write %s: %s\n", filename, strerror(errno));
+ free(key);
return 1;
}
if(!ecdsa_write_pem_private_key(key, f)) {
fprintf(stderr, "Could not write ECDSA private key\n");
fclose(f);
+ free(key);
return 1;
}
sha512(fingerprint, strlen(fingerprint), hash);
b64encode_urlsafe(hash, hash, 18);
+ free(key);
+
// Create a random cookie for this invitation.
char cookie[25];
randomize(cookie, 18);
sha512(buf, sizeof(buf), cookiehash);
b64encode_urlsafe(cookiehash, cookiehash, 18);
+ free(fingerprint);
+
b64encode_urlsafe(cookie, cookie, 18);
// Create a file containing the details of the invitation.
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) {
}
}
} 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.
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;
struct addrinfo *ai = str2addrinfo(address, port, SOCK_STREAM);
if(!ai) {
+ free(b64key);
return 1;
}
if(!aip) {
freeaddrinfo(ai);
+ free(b64key);
return 1;
}
}
}
freeaddrinfo(ai);
+ ai = NULL;
+ aip = NULL;
+
+ free(b64key);
+ b64key = NULL;
// Check if the hash of the key he gave us matches the hash in the URL.
char *fingerprint = line + 2;
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;
}