Remove everything GPL that is not copyright Guus Sliepen, update copyright statements.

[meshlink] / src / invitation.c

diff --git a/src/invitation.c b/src/invitation.c
index 3f7f97647c7abef45637fa1114ff2e82e61ab604..f75bf40928f91af97b3241c12862756eba9fab73 100644 (file)
--- a/src/invitation.c
+++ b/src/invitation.c
@@ -1,6 +1,6 @@
 /*
     invitation.c -- Create and accept invitations
-    Copyright (C) 2013 Guus Sliepen <guus@tinc-vpn.org>
+    Copyright (C) 2014 Guus Sliepen <guus@meshlink.io>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -24,10 +24,8 @@
 #include "ecdsa.h"
 #include "ecdsagen.h"
 #include "invitation.h"
-#include "names.h"
 #include "netutl.h"
 #include "rsagen.h"
-#include "script.h"
 #include "sptps.h"
 #include "tincctl.h"
 #include "utils.h"
@@ -142,12 +140,19 @@ char *get_my_hostname() {
                }
        }
 
+       if(!tty) {
+               if(!hostname) {
+                       fprintf(stderr, "Could not determine the external address or hostname. Please set Address manually.\n");
+                       return NULL;
+               }
+               goto save;
+       }
+
 again:
-       printf("Please enter your host's external address or hostname");
+       fprintf(stderr, "Please enter your host's external address or hostname");
        if(hostname)
-               printf(" [%s]", hostname);
-       printf(": ");
-       fflush(stdout);
+               fprintf(stderr, " [%s]", hostname);
+       fprintf(stderr, ": ");
 
        if(!fgets(line, sizeof line, stdin)) {
                fprintf(stderr, "Error while reading stdin: %s\n", strerror(errno));
@@ -340,12 +345,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;
@@ -399,8 +409,12 @@ int cmd_invite(int argc, char *argv[]) {
                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])))
+                                       || (!strncasecmp(buf, "Broadcast", 9) && strchr(" \t=", buf[9]))) {
                                fputs(buf, f);
+                               // Make sure there is a newline character.
+                               if(!strchr(buf, '\n'))
+                                       fputc('\n', f);
+                       }
                }
                fclose(tc);
        }
@@ -418,22 +432,6 @@ int cmd_invite(int argc, char *argv[]) {
        char *url;
        xasprintf(&url, "%s/%s%s", address, hash, cookie);
 
-       // Call the inviation-created script
-       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);
-       free(filename);
-       free(address);
-
        return 0;
 }
 
@@ -547,13 +545,6 @@ static bool finalize_join(void) {
        char temp_netname[32];
 
 make_names:
-       if(!confbasegiven) {
-               free(confbase);
-               confbase = NULL;
-       }
-
-       make_names();
-
        free(tinc_conf);
        free(hosts_dir);
 
@@ -562,7 +553,7 @@ make_names:
 
        if(!access(tinc_conf, F_OK)) {
                fprintf(stderr, "Configuration file %s already exists!\n", tinc_conf);
-               if(!tty || confbasegiven)
+               if(confbasegiven)
                        return false;
 
                // Generate a random netname, ask for a better one later.
@@ -738,7 +729,7 @@ make_names:
        check_port(name);
 
 ask_netname:
-       if(ask_netname) {
+       if(ask_netname && tty) {
                fprintf(stderr, "Enter a new netname: ");
                if(!fgets(line, sizeof line, stdin)) {
                        fprintf(stderr, "Error while reading stdin: %s\n", strerror(errno));
@@ -759,9 +750,10 @@ ask_netname:
 
                free(newbase);
                netname = line;
-               make_names();
        }
 
+       fprintf(stderr, "Configuration stored in: %s\n", confbase);
+
        return true;
 }
 
@@ -818,11 +810,6 @@ int cmd_join(int argc, char *argv[]) {
        }
 
        // Make sure confbase exists and is accessible.
-       if(strcmp(confdir, confbase) && mkdir(confdir, 0755) && errno != EEXIST) {
-               fprintf(stderr, "Could not create directory %s: %s\n", confdir, strerror(errno));
-               return 1;
-       }
-
        if(mkdir(confbase, 0777) && errno != EEXIST) {
                fprintf(stderr, "Could not create directory %s: %s\n", confbase, strerror(errno));
                return 1;
@@ -845,10 +832,8 @@ int cmd_join(int argc, char *argv[]) {
        if(argc > 1) {
                invitation = argv[1];
        } else {
-               if(tty) {
-                       printf("Enter invitation URL: ");
-                       fflush(stdout);
-               }
+               if(tty)
+                       fprintf(stderr, "Enter invitation URL: ");
                errno = EPIPE;
                if(!fgets(line, sizeof line, stdin)) {
                        fprintf(stderr, "Error while reading stdin: %s\n", strerror(errno));