Fix compiler warnings.

diff --git a/src/have.h b/src/have.h
index ca91b7024b9cfb42107dd6b609e72a912dffaf34..c49e506c66bca6d54c092b5cf0284cab80066c27 100644 (file)
--- a/src/have.h
+++ b/src/have.h
@@ -166,7 +166,4 @@
 #define SLASH "/"
 #endif
 
-#define CONFDIR "/etc/"
-#define LOCALSTATEDIR "/var/"
-
 #endif /* __TINC_SYSTEM_H__ */

diff --git a/src/libmeshlink.c b/src/libmeshlink.c
index ed3e6755a3663847c721cd61c95b20c422be98e5..fd7426cace616e9e48e2e2a377689ad7d81169ef 100644 (file)
--- a/src/libmeshlink.c
+++ b/src/libmeshlink.c
@@ -17,12 +17,19 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#include "libmeshlink.h"
-#ifdef HAVE_SYS_MMAN_H
-#include <sys/mman.h>
-#endif
+#include "system.h"
+
+#include <pthread.h>
+
+#include "connection.h"
 #include "crypto.h"
 #include "ecdsagen.h"
+#include "edge.h"
+#include "libmeshlink.h"
+#include "net.h"
+#include "node.h"
+#include "protocol.h"
+
 char *hosts_dir = NULL;
 static char *name = NULL;
 char *tinc_conf = NULL;
@@ -33,37 +40,6 @@ static bool tty = false;
 static bool do_mlock = false;
 #endif
 
-/*
-  initialize network
-*/
-bool setup_meshlink_network(void) {
-       init_connections();
-       init_nodes();
-       init_edges();
-       init_requests();
-
-       if(get_config_int(lookup_config(config_tree, "PingInterval"), &pinginterval)) {
-               if(pinginterval < 1) {
-                       pinginterval = 86400;
-               }
-       } else
-               pinginterval = 60;
-
-       if(!get_config_int(lookup_config(config_tree, "PingTimeout"), &pingtimeout))
-               pingtimeout = 5;
-       if(pingtimeout < 1 || pingtimeout > pinginterval)
-               pingtimeout = pinginterval;
-
-       //TODO: check if this makes sense in libmeshlink
-       if(!get_config_int(lookup_config(config_tree, "MaxOutputBufferSize"), &maxoutbufsize))
-               maxoutbufsize = 10 * MTU;
-
-       if(!setup_myself())
-               return false;
-
-       return true;
-}
-
 /* Open a file with the desired permissions, minus the umask.
    Also, if we want to create an executable file, we call fchmod()
    to set the executable bits. */
@@ -292,7 +268,7 @@ static bool try_bind(int port) {
        return true;
 }
 
-int check_port(char *name) {
+int check_port(const char *name) {
        if(try_bind(655))
                return 655;
 
@@ -366,8 +342,8 @@ bool tinc_setup(const char* confbaseapi, const char* name) {
 
 bool tinc_start(const char* confbaseapi) {
        pthread_t tincThread;
-       confbase = confbaseapi;
-       pthread_create(&tincThread,NULL,tinc_main_thread,confbaseapi);
+       confbase = xstrdup(confbaseapi);
+       pthread_create(&tincThread,NULL,tinc_main_thread,confbase);
        pthread_detach(tincThread);
 return true;
 }
@@ -385,7 +361,7 @@ __attribute__((destructor)) static void meshlink_exit(void) {
 }
 
 
-bool tinc_main_thread(void * in) {
+void *tinc_main_thread(void * in) {
        static bool status = false;
 
        /* If nonzero, write log entries to a separate file. */
@@ -402,50 +378,11 @@ bool tinc_main_thread(void * in) {
 
        //char *priority = NULL; //shoud be not needed in libmeshlink
 
-#ifdef HAVE_MLOCKALL
-       /* Lock all pages into memory if requested.
-        * This has to be done after daemon()/fork() so it works for child.
-        * No need to do that in parent as it's very short-lived. */
-       if(do_mlock && mlockall(MCL_CURRENT | MCL_FUTURE) != 0) {
-               logger(DEBUG_ALWAYS, LOG_ERR, "System call `%s' failed: %s", "mlockall",
-                  strerror(errno));
-               return 1;
-       }
-#endif
-
        /* Setup sockets and open device. */
 
-       if(!setup_meshlink_network())
+       if(!setup_network())
                goto end;
 
-       /* Change process priority */
-       //should be not needed in libmeshlink
-       //if(get_config_string(lookup_config(config_tree, "ProcessPriority"), &priority)) {
-       //      if(!strcasecmp(priority, "Normal")) {
-       //              if (setpriority(NORMAL_PRIORITY_CLASS) != 0) {
-       //                      logger(DEBUG_ALWAYS, LOG_ERR, "System call `%s' failed: %s", "setpriority", strerror(errno));
-       //                      goto end;
-       //              }
-       //      } else if(!strcasecmp(priority, "Low")) {
-       //              if (setpriority(BELOW_NORMAL_PRIORITY_CLASS) != 0) {
-       //                             logger(DEBUG_ALWAYS, LOG_ERR, "System call `%s' failed: %s", "setpriority", strerror(errno));
-       //                      goto end;
-       //              }
-       //      } else if(!strcasecmp(priority, "High")) {
-       //              if (setpriority(HIGH_PRIORITY_CLASS) != 0) {
-       //                      logger(DEBUG_ALWAYS, LOG_ERR, "System call `%s' failed: %s", "setpriority", strerror(errno));
-       //                      goto end;
-       //              }
-       //      } else {
-       //              logger(DEBUG_ALWAYS, LOG_ERR, "Invalid priority `%s`!", priority);
-       //              goto end;
-       //      }
-       //}
-
-       /* drop privileges */
-       //if (!drop_privs())
-       //      goto end;
-
        /* Start main loop. It only exits when tinc is killed. */
 
        logger(DEBUG_ALWAYS, LOG_NOTICE, "Ready");
@@ -465,8 +402,7 @@ end:
 
        exit_configuration(&config_tree);
 
-       return status;
-
+       return (void *)status;
 }
 
 bool tinc_stop();

diff --git a/src/libmeshlink.h b/src/libmeshlink.h
index af1c1bab07c4ebe9bba6cf643638d34c8ce4857a..e70f89f074c025def11132971750f77622ab9a7f 100644 (file)
--- a/src/libmeshlink.h
+++ b/src/libmeshlink.h
@@ -27,9 +27,9 @@
 extern char *hosts_dir;
 extern FILE *fopenmask(const char *filename, const char *mode, mode_t perms);
 
-extern int check_port(char *name);
+extern int check_port(const char *name);
 
-bool tinc_main_thread(void * in);
+void *tinc_main_thread(void * in);
 
 /* OLD: tinc_configuration_t provides all information required to setup "/etc/tinc"
 I think tinc_setup() should basically do what cmd_init() from src/tincctl.c does, except it doesn't have to generate a tinc-up script.