Tell invited node about Mode and Broadcast settings.

[tinc] / src / invitation.c

diff --git a/src/invitation.c b/src/invitation.c
index e6567ba..36dfa41 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"
@@ -380,7 +381,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 +408,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);