Don't try to mkdir(CONFDIR) if --config is used.

[tinc] / src / invitation.c

diff --git a/src/invitation.c b/src/invitation.c
index e6567ba..59bcf45 100644 (file)
--- a/src/invitation.c
+++ b/src/invitation.c
@@ -27,6 +27,7 @@
 #include "names.h"
 #include "netutl.h"
 #include "rsagen.h"
+#include "script.h"
 #include "sptps.h"
 #include "tincctl.h"
 #include "utils.h"
@@ -34,6 +35,48 @@
 
 int addressfamily = AF_UNSPEC;
 
+static void scan_for_hostname(const char *filename, char **hostname, char **port) {
+       if(!filename || (*hostname && *port))
+               return;
+
+       FILE *f = fopen(filename, "r");
+       if(!f)
+               return;
+
+       while(fgets(line, sizeof line, f)) {
+               if(!rstrip(line))
+                       continue;
+               char *p = line, *q;
+               p += strcspn(p, "\t =");
+               if(!*p)
+                       continue;
+               q = p + strspn(p, "\t ");
+               if(*q == '=')
+                       q += 1 + strspn(q + 1, "\t ");
+               *p = 0;
+               p = q + strcspn(q, "\t ");
+               if(*p)
+                       *p++ = 0;
+               p += strspn(p, "\t ");
+               p[strcspn(p, "\t ")] = 0;
+
+               if(!*port && !strcasecmp(line, "Port")) {
+                       *port = xstrdup(q);
+               } else if(!*hostname && !strcasecmp(line, "Address")) {
+                       *hostname = xstrdup(q);
+                       if(*p) {
+                               free(*port);
+                               *port = xstrdup(p);
+                       }
+               }
+
+               if(*hostname && *port)
+                       break;
+       }
+
+       fclose(f);
+}
+
 char *get_my_hostname() {
        char *hostname = NULL;
        char *port = NULL;
@@ -44,39 +87,8 @@ char *get_my_hostname() {
        // Use first Address statement in own host config file
        if(check_id(name)) {
                xasprintf(&filename, "%s" SLASH "hosts" SLASH "%s", confbase, name);
-               FILE *f = fopen(filename, "r");
-               if(f) {
-                       while(fgets(line, sizeof line, f)) {
-                               if(!rstrip(line))
-                                       continue;
-                               char *p = line, *q;
-                               p += strcspn(p, "\t =");
-                               if(!*p)
-                                       continue;
-                               q = p + strspn(p, "\t ");
-                               if(*q == '=')
-                                       q += 1 + strspn(q + 1, "\t ");
-                               *p = 0;
-                               p = q + strcspn(q, "\t ");
-                               if(*p)
-                                       *p++ = 0;
-                               p += strspn(p, "\t ");
-                               p[strcspn(p, "\t ")] = 0;
-                               if(!port && !strcasecmp(line, "Port")) {
-                                       port = xstrdup(q);
-                                       continue;
-                               }
-                               if(strcasecmp(line, "Address"))
-                                       continue;
-                               hostname = xstrdup(q);
-                               if(*p) {
-                                       free(port);
-                                       port = xstrdup(p);
-                               }
-                               break;
-                       }
-                       fclose(f);
-               }
+               scan_for_hostname(filename, &hostname, &port);
+               scan_for_hostname(tinc_conf, &hostname, &port);
        }
 
        if(hostname)
@@ -328,12 +340,17 @@ int cmd_invite(int argc, char *argv[]) {
                }
                chmod(filename, 0600);
                ecdsa_write_pem_private_key(key, f);
+               fclose(f);
+
+               if(connect_tincd(false))
+                       sendline(fd, "%d %d", CONTROL, REQ_RELOAD);
        } else {
                key = ecdsa_read_pem_private_key(f);
+               fclose(f);
                if(!key)
                        fprintf(stderr, "Could not read private key from %s\n", filename);
        }
-       fclose(f);
+
        free(filename);
        if(!key)
                return 1;
@@ -380,7 +397,19 @@ int cmd_invite(int argc, char *argv[]) {
        if(netname)
                fprintf(f, "NetName = %s\n", netname);
        fprintf(f, "ConnectTo = %s\n", myname);
-       // TODO: copy Broadcast and Mode
+
+       // Copy Broadcast and Mode
+       FILE *tc = fopen(tinc_conf, "r");
+       if(tc) {
+               char buf[1024];
+               while(fgets(buf, sizeof buf, tc)) {
+                       if((!strncasecmp(buf, "Mode", 4) && strchr(" \t=", buf[4]))
+                                       || (!strncasecmp(buf, "Broadcast", 9) && strchr(" \t=", buf[9])))
+                               fputs(buf, f);
+               }
+               fclose(tc);
+       }
+
        fprintf(f, "#---------------------------------------------------------------#\n");
        fprintf(f, "Name = %s\n", myname);
 
@@ -395,17 +424,15 @@ int cmd_invite(int argc, char *argv[]) {
        xasprintf(&url, "%s/%s%s", address, hash, cookie);
 
        // Call the inviation-created script
-       setenv("NAME", myname, true);
-       setenv("NETNAME", netname, true);
-       setenv("NODE", argv[1], true);
-       setenv("INVITATION_FILE", filename, true);
-       setenv("INVITATION_URL", url, true);
-       char *scriptname;
-       xasprintf(&scriptname, "\"%s" SLASH "invitation-created\"", confbase);
-       system(scriptname);
-       free(scriptname);
-       unsetenv("NODE");
-       unsetenv("INVITATION");
+       char *envp[6] = {};
+       xasprintf(&envp[0], "NAME=%s", myname);
+       xasprintf(&envp[1], "NETNAME=%s", netname);
+       xasprintf(&envp[2], "NODE=%s", argv[1]);
+       xasprintf(&envp[3], "INVITATION_FILE=%s", filename);
+       xasprintf(&envp[4], "INVITATION_URL=%s", url);
+       execute_script("invitation-created", envp);
+       for(int i = 0; i < 6 && envp[i]; i++)
+               free(envp[i]);
 
        puts(url);
        free(url);
@@ -796,7 +823,7 @@ int cmd_join(int argc, char *argv[]) {
        }
 
        // Make sure confbase exists and is accessible.
-       if(strcmp(confdir, confbase) && mkdir(confdir, 0755) && errno != EEXIST) {
+       if(!confbase_given && mkdir(confdir, 0755) && errno != EEXIST) {
                fprintf(stderr, "Could not create directory %s: %s\n", confdir, strerror(errno));
                return 1;
        }