Move bypass_security to mesh

diff --git a/src/conf.h b/src/conf.h
index 015bba5bbd6fccc0c97cfe2388dff3db6bedc551..27561ef7a75f8f7c3a699b70db3fccddd19af59d 100644 (file)
--- a/src/conf.h
+++ b/src/conf.h
@@ -33,7 +33,6 @@ typedef struct config_t {
 extern int pinginterval;
 extern int pingtimeout;
 extern int maxtimeout;
-extern bool bypass_security;
 
 extern void init_configuration(struct splay_tree_t **);
 extern void exit_configuration(struct splay_tree_t **);

diff --git a/src/meshlink_internal.h b/src/meshlink_internal.h
index 4be2f739eca43835650126d9025235187c70b76c..af63cc2093969b8a719c370920dacee047017966 100644 (file)
--- a/src/meshlink_internal.h
+++ b/src/meshlink_internal.h
@@ -92,6 +92,7 @@ struct meshlink_handle {
        struct ecdsa *invitation_key;
 
        debug_t debug_level;
+       bool bypass_security;
 };
 
 /// A handle for a MeshLink node.

diff --git a/src/protocol_auth.c b/src/protocol_auth.c
index 3bd444ea7aa0f5c14d490ee926ac66dac17c0f83..c810877f9b863b24724af501f0fb3fc2a50c3b4a 100644 (file)
--- a/src/protocol_auth.c
+++ b/src/protocol_auth.c
@@ -314,7 +314,7 @@ bool id_h(connection_t *c, const char *request) {
                return false;
        }
 
-       if(bypass_security) {
+       if(mesh->bypass_security) {
                if(!c->config_tree)
                        init_configuration(&c->config_tree);
                c->allow_request = ACK;

diff --git a/src/tincd.c b/src/tincd.c
index 7d580cf270c27def2aa84101f80fcce668f466f6..45ff3ff697e51f21059534e271f4969e41b1954b 100644 (file)
--- a/src/tincd.c
+++ b/src/tincd.c
@@ -51,9 +51,6 @@ static bool show_help = false;
 /* If nonzero, print the version on standard output and exit.  */
 static bool show_version = false;
 
-/* If nonzero, use null ciphers and skip all key exchanges. */
-bool bypass_security = false;
-
 char **g_argv;                  /* a copy of the cmdline arguments */
 
 static int status = 1;