Better default output file for generated public keys.

[tinc] / src / tincctl.c

diff --git a/src/tincctl.c b/src/tincctl.c
index 7b44881..ea96fa1 100644 (file)
--- a/src/tincctl.c
+++ b/src/tincctl.c
@@ -834,16 +834,10 @@ static int cmd_stop(int argc, char *argv[]) {
        }
 
        sendline(fd, "%d %d", CONTROL, REQ_STOP);
-       if(!recvline(fd, line, sizeof line) || sscanf(line, "%d %d %d", &code, &req, &result) != 3 || code != CONTROL || req != REQ_STOP || result) {
-               fprintf(stderr, "Could not stop tinc daemon.\n");
-               return 1;
-       }
 
-       // Wait for tincd to close the connection...
-       fd_set r;
-       FD_ZERO(&r);
-       FD_SET(fd, &r);
-       select(fd + 1, &r, NULL, NULL, NULL);
+       while(recvline(fd, line, sizeof line)) {
+               // Wait for tincd to close the connection...
+       }
 #else
        if(!remove_service())
                return 1;
@@ -1205,10 +1199,11 @@ static int rstrip(char *value) {
        return len;
 }
 
-static char *get_my_name() {
+static char *get_my_name(bool verbose) {
        FILE *f = fopen(tinc_conf, "r");
        if(!f) {
-               fprintf(stderr, "Could not open %s: %s\n", tinc_conf, strerror(errno));
+               if(verbose)
+                       fprintf(stderr, "Could not open %s: %s\n", tinc_conf, strerror(errno));
                return NULL;
        }
 
@@ -1234,7 +1229,8 @@ static char *get_my_name() {
        }
 
        fclose(f);
-       fprintf(stderr, "Could not find Name in %s.\n", tinc_conf);
+       if(verbose)
+               fprintf(stderr, "Could not find Name in %s.\n", tinc_conf);
        return NULL;
 }
 
@@ -1408,7 +1404,7 @@ static int cmd_config(int argc, char *argv[]) {
                /* Should this go into our own host config file? */
 
                if(!node && !(variables[i].type & VAR_SERVER)) {
-                       node = get_my_name();
+                       node = get_my_name(true);
                        if(!node)
                                return 1;
                }
@@ -1698,6 +1694,9 @@ static int cmd_generate_keys(int argc, char *argv[]) {
                return 1;
        }
 
+       if(!name)
+               name = get_my_name(false);
+
        return !(rsa_keygen(argc > 1 ? atoi(argv[1]) : 2048, true) && ecdsa_keygen(true));
 }
 
@@ -1707,6 +1706,9 @@ static int cmd_generate_rsa_keys(int argc, char *argv[]) {
                return 1;
        }
 
+       if(!name)
+               name = get_my_name(false);
+
        return !rsa_keygen(argc > 1 ? atoi(argv[1]) : 2048, true);
 }
 
@@ -1716,6 +1718,9 @@ static int cmd_generate_ecdsa_keys(int argc, char *argv[]) {
                return 1;
        }
 
+       if(!name)
+               name = get_my_name(false);
+
        return !ecdsa_keygen(true);
 }
 
@@ -1837,13 +1842,15 @@ static int cmd_export(int argc, char *argv[]) {
                return 1;
        }
 
-       char *name = get_my_name();
+       char *name = get_my_name(true);
        if(!name)
                return 1;
 
        int result = export(name, stdout);
        if(!tty)
                fclose(stdout);
+
+       free(name);
        return result;
 }