Merge branch 'master' into saverio

[meshlink] / src / libmeshlink.h

diff --git a/src/libmeshlink.h b/src/libmeshlink.h
index f97050b586235e06b8c8bcd46de33bd384f7e318..af1c1bab07c4ebe9bba6cf643638d34c8ce4857a 100644 (file)
--- a/src/libmeshlink.h
+++ b/src/libmeshlink.h
@@ -1,6 +1,6 @@
 /*
     libmeshlink.h -- Tincd Library
-    Copyright (C) 2014 Guus Sliepen <guus@tinc-vpn.org> Saverio Proto <zioproto@gmail.com>
+    Copyright (C) 2014 Guus Sliepen <guus@meshlink.io> Saverio Proto <zioproto@gmail.com>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -19,18 +19,33 @@
 
 #include "system.h"
 #include "node.h"
-#include "names.h"
-#include "tincctl.h"
+//#include "tincctl.h"
+#include "xalloc.h"
+#include "logger.h"
+#include "route.h"
+
+extern char *hosts_dir;
+extern FILE *fopenmask(const char *filename, const char *mode, mode_t perms);
+
+extern int check_port(char *name);
+
+bool 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.
 */
-bool tinc_setup(const char* tinc_conf, const char* name);
+bool tinc_setup(const char* confbase, const char* name);
 
 bool tinc_start(const char* path);
 
 bool tinc_stop();
 
+typedef struct tincpackethdr {
+  u_int8_t legacymtu[14];
+  u_int8_t destination[16];
+  u_int8_t source[16];
+} __attribute__ ((__packed__)) tincpackethdr;
+
 // can be called from any thread
 bool tinc_send_packet(node_t *receiver, const char* buf, unsigned int len);