Use our own infrastructure for finding out the local node's externally visible host...

[meshlink] / src / invitation.c

diff --git a/src/invitation.c b/src/invitation.c
index 2dccd8fb9a1994706f0c8dfa7ba2b1fd60e07136..6ed17ca16c655f24c5751eceb24becf17a1667cd 100644 (file)
--- 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);
@@ -881,7 +885,7 @@ int cmd_join(int argc, char *argv[]) {
                return 1;
        }
 
-       // Check if the hash of the key he have us matches the hash in the URL.
+       // Check if the hash of the key he gave us matches the hash in the URL.
        char *fingerprint = line + 2;
        digest_t *digest = digest_open_by_name("sha256", 18);
        if(!digest)