Moved few config parameters to make lib usage possible.

src/conf.c

@@ -35,6 +35,15 @@
 #include "utils.h"              /* for cp */
 #include "xalloc.h"
 
+/* If nonzero, write log entries to a separate file. */
+bool use_logfile = false;
+
+/* If nonzero, use syslog instead of stderr in no-detach mode. */
+bool use_syslog = false;
+
+/* If nonzero, use null ciphers and skip all key exchanges. */
+bool bypass_security = false;
+
 splay_tree_t *config_tree;
 
 int pinginterval = 0;           /* seconds between pings */

src/conf.h

@@ -34,6 +34,10 @@ typedef struct config_t {
 #include "subnet.h"
 
 extern splay_tree_t *config_tree;
+extern bool use_logfile;
+extern bool use_syslog;
+extern bool bypass_security;
+
 
 extern int pinginterval;
 extern int pingtimeout;

src/tincd.c

@@ -66,9 +66,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;
-
 #ifdef HAVE_MLOCKALL
 /* If nonzero, disable swapping for this process. */
 static bool do_mlock = false;
@@ -82,12 +79,6 @@ static bool do_chroot = false;
 static const char *switchuser = NULL;
 #endif
 
-/* If nonzero, write log entries to a separate file. */
-bool use_logfile = false;
-
-/* If nonzero, use syslog instead of stderr in no-detach mode. */
-bool use_syslog = false;
-
 char **g_argv;                  /* a copy of the cmdline arguments */
 
 static int status = 1;