Send broadcast packets using a random socket, and properly support IPv6.

[tinc] / src / tincd.c

diff --git a/src/tincd.c b/src/tincd.c
index 148e13e..53f91e8 100644 (file)
--- a/src/tincd.c
+++ b/src/tincd.c
@@ -337,15 +337,8 @@ static void indicator(int a, int b, void *p) {
 static bool keygen(int bits) {
        RSA *rsa_key;
        FILE *f;
-       char *name = NULL;
-       char *filename;
-
-       get_config_string(lookup_config(config_tree, "Name"), &name);
-
-       if(name && !check_id(name)) {
-               fprintf(stderr, "Invalid name for myself!\n");
-               return false;
-       }
+       char *name = get_name();
+       char *pubname, *privname;
 
        fprintf(stderr, "Generating %d bits keys:\n", bits);
        rsa_key = RSA_generate_key(bits, 0x10001, indicator, NULL);
@@ -356,8 +349,9 @@ static bool keygen(int bits) {
        } else
                fprintf(stderr, "Done.\n");
 
-       xasprintf(&filename, "%s/rsa_key.priv", confbase);
-       f = ask_and_open(filename, "private RSA key");
+       xasprintf(&privname, "%s/rsa_key.priv", confbase);
+       f = ask_and_open(privname, "private RSA key");
+       free(privname);
 
        if(!f)
                return false;
@@ -370,14 +364,14 @@ static bool keygen(int bits) {
        fputc('\n', f);
        PEM_write_RSAPrivateKey(f, rsa_key, NULL, NULL, 0, NULL, NULL);
        fclose(f);
-       free(filename);
 
        if(name)
-               xasprintf(&filename, "%s/hosts/%s", confbase, name);
+               xasprintf(&pubname, "%s/hosts/%s", confbase, name);
        else
-               xasprintf(&filename, "%s/rsa_key.pub", confbase);
+               xasprintf(&pubname, "%s/rsa_key.pub", confbase);
 
-       f = ask_and_open(filename, "public RSA key");
+       f = ask_and_open(pubname, "public RSA key");
+       free(pubname);
 
        if(!f)
                return false;
@@ -385,9 +379,7 @@ static bool keygen(int bits) {
        fputc('\n', f);
        PEM_write_RSAPublicKey(f, rsa_key);
        fclose(f);
-       free(filename);
-       if(name)
-               free(name);
+       free(name);
 
        return true;
 }
@@ -475,8 +467,11 @@ static bool drop_privs() {
                               "initgroups", strerror(errno));
                        return false;
                }
+#ifndef __ANDROID__
+// Not supported in android NDK
                endgrent();
                endpwent();
+#endif
        }
        if (do_chroot) {
                tzset();        /* for proper timestamps in logs */