Merge remote-tracking branch 'origin/master' into saverio

[meshlink] / src / libmeshlink.h

diff --git a/src/libmeshlink.h b/src/libmeshlink.h
index 7cbd6374e303fd76b44721ced426ccb17a593a8e..0cbfec7ec9150200df350a3994d37b9b1d074178 100644 (file)
--- a/src/libmeshlink.h
+++ b/src/libmeshlink.h
@@ -24,12 +24,17 @@
 #include "logger.h"
 #include "route.h"
 
+typedef void (*recvdata_cb_t)(void *data);
+void recvdata_register_cb(recvdata_cb_t cb);
+
+extern recvdata_cb_t recv_callback;
+
 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.
@@ -41,6 +46,7 @@ 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;