X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Finvitation.c;h=749870458e61a7ec9f3292af831c9d2401bc6d05;hp=f1cde581584ea80227f3212a3edad251997fae0b;hb=5dec1c25713a19c49fcbb885200184a9682ef175;hpb=81c71203201f6642a496f466660236efdd522ceb

diff --git a/src/invitation.c b/src/invitation.c
index f1cde581..74987045 100644
--- a/src/invitation.c
+++ b/src/invitation.c
@@ -32,12 +32,6 @@
 #include "utils.h"
 #include "xalloc.h"
 
-#ifdef HAVE_MINGW
-#define SCRIPTEXTENSION ".bat"
-#else
-#define SCRIPTEXTENSION ""
-#endif
-
 int addressfamily = AF_UNSPEC;
 
 char *get_my_hostname() {
@@ -90,12 +84,14 @@ char *get_my_hostname() {
 
 	// If that doesn't work, guess externally visible hostname
 	fprintf(stderr, "Trying to discover externally visible hostname...\n");
-	struct addrinfo *ai = str2addrinfo("ifconfig.me", "80", SOCK_STREAM);
-	static const char request[] = "GET /host HTTP/1.0\r\n\r\n";
-	if(ai) {
-		int s = socket(ai->ai_family, ai->ai_socktype, ai->ai_protocol);
+	struct addrinfo *ai = str2addrinfo("tinc-vpn.org", "80", SOCK_STREAM);
+	struct addrinfo *aip = ai;
+	static const char request[] = "GET http://tinc-vpn.org/host.cgi HTTP/1.0\r\n\r\n";
+
+	while(aip) {
+		int s = socket(aip->ai_family, aip->ai_socktype, aip->ai_protocol);
 		if(s >= 0) {
-			if(connect(s, ai->ai_addr, ai->ai_addrlen)) {
+			if(connect(s, aip->ai_addr, aip->ai_addrlen)) {
 				closesocket(s);
 				s = -1;
 			}
@@ -112,14 +108,20 @@ char *get_my_hostname() {
 					hostname = xstrdup(p + 1);
 			}
 			closesocket(s);
+			if(hostname)
+				break;
 		}
-		freeaddrinfo(ai);
+		aip = aip->ai_next;
+		continue;
 	}
 
+	if(ai)
+		freeaddrinfo(ai);
+
 	// Check that the hostname is reasonable
 	if(hostname) {
 		for(char *p = hostname; *p; p++) {
-			if(isalnum(*p) || *p == '-' || *p == '.')
+			if(isalnum(*p) || *p == '-' || *p == '.' || *p == ':')
 				continue;
 			// If not, forget it.
 			free(hostname);
@@ -362,6 +364,9 @@ int cmd_invite(int argc, char *argv[]) {
 	if(!f)
 		abort();
 
+	// Get the local address
+	char *address = get_my_hostname();
+
 	// Fill in the details.
 	fprintf(f, "Name = %s\n", argv[1]);
 	if(netname)
@@ -376,7 +381,6 @@ int cmd_invite(int argc, char *argv[]) {
 	fclose(f);
 
 	// Create an URL from the local address, key hash and cookie
-	char *address = get_my_hostname();
 	printf("%s/%s%s\n", address, hash, cookie);
 	free(filename);
 	free(address);
@@ -684,10 +688,6 @@ make_names:
 
 	check_port(name);
 
-	fprintf(stderr, "Invitation succesfully accepted.\n");
-	shutdown(sock, SHUT_RDWR);
-	success = true;
-
 ask_netname:
 	if(ask_netname) {
 		fprintf(stderr, "Enter a new netname: ");
@@ -716,6 +716,7 @@ ask_netname:
 	return true;
 }
 
+
 static bool invitation_send(void *handle, uint8_t type, const char *data, size_t len) {
 	while(len) {
 		int result = send(sock, data, len, 0);
@@ -744,6 +745,12 @@ static bool invitation_receive(void *handle, uint8_t type, const char *msg, uint
 		case 1:
 			return finalize_join();
 
+		case 2:
+			fprintf(stderr, "Invitation succesfully accepted.\n");
+			shutdown(sock, SHUT_RDWR);
+			success = true;
+			break;
+
 		default:
 			return false;
 	}