Merge branch 'mesh_topology_output' into roles

[meshlink] / src / net.h

diff --git a/src/net.h b/src/net.h
index 2f3a93aca93593274fcc713192d0f9ead21d1380..d2a60bcf685c858ef079f59b8d1b76305b609722 100644 (file)
--- a/src/net.h
+++ b/src/net.h
@@ -17,8 +17,8 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef __TINC_NET_H__
-#define __TINC_NET_H__
+#ifndef __MESHLINK_NET_H__
+#define __MESHLINK_NET_H__
 
 #include "event.h"
 #include "sockaddr.h"
@@ -66,6 +66,7 @@ typedef struct outgoing_t {
        struct addrinfo *ai;
        struct addrinfo *aip;
        timeout_t ev;
+       struct meshlink_handle *mesh;
 } outgoing_t;
 
 extern int maxoutbufsize;
@@ -75,7 +76,6 @@ extern unsigned replaywin;
 extern int keylifetime;
 extern int max_connection_burst;
 extern bool do_prune;
-extern int autoconnect;
 
 /* Yes, very strange placement indeed, but otherwise the typedefs get all tangled up */
 #include "connection.h"
@@ -104,6 +104,7 @@ extern int main_loop(struct meshlink_handle *mesh);
 extern void terminate_connection(struct meshlink_handle *mesh, struct connection_t *, bool);
 extern bool node_read_ecdsa_public_key(struct meshlink_handle *mesh, struct node_t *);
 extern bool read_ecdsa_public_key(struct meshlink_handle *mesh, struct connection_t *);
+extern bool read_ecdsa_private_key(struct meshlink_handle *mesh);
 extern void send_mtu_probe(struct meshlink_handle *mesh, struct node_t *);
 extern void handle_meta_connection_data(struct meshlink_handle *mesh, struct connection_t *);
 extern void retry(struct meshlink_handle *mesh);
@@ -114,4 +115,4 @@ extern void retry(struct meshlink_handle *mesh);
 extern CRITICAL_SECTION mutex;
 #endif
 
-#endif /* __TINC_NET_H__ */
+#endif /* __MESHLINK_NET_H__ */