From 2c424175639d62ea806b79173dfe6f554cf3ceb9 Mon Sep 17 00:00:00 2001
From: Saverio Proto <zioproto@gmail.com>
Date: Wed, 23 Apr 2014 23:54:14 +0200
Subject: [PATCH] Move bypass_security to mesh

---
 src/conf.h              | 1 -
 src/meshlink_internal.h | 1 +
 src/protocol_auth.c     | 2 +-
 src/tincd.c             | 3 ---
 4 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/conf.h b/src/conf.h
index 015bba5b..27561ef7 100644
--- 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 4be2f739..af63cc20 100644
--- 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 3bd444ea..c810877f 100644
--- 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 7d580cf2..45ff3ff6 100644
--- 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;
-- 
2.39.5