Update all header guards.

[meshlink] / src / net.h

diff --git a/src/net.h b/src/net.h
index 94349d944baf2be5e97df690420117130979790e..1eed88d12aa166a1d3ff8bec9c9d891c2de66ce0 100644 (file)
--- a/src/net.h
+++ b/src/net.h
@@ -1,6 +1,9 @@
+#ifndef MESHLINK_NET_H
+#define MESHLINK_NET_H
+
 /*
     net.h -- header for net.c
-    Copyright (C) 2014 Guus Sliepen <guus@meshlink.io>
+    Copyright (C) 2014, 2017 Guus Sliepen <guus@meshlink.io>
 
     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
@@ -17,9 +20,6 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef __TINC_NET_H__
-#define __TINC_NET_H__
-
 #include "event.h"
 #include "sockaddr.h"
 
@@ -63,19 +63,19 @@ typedef struct outgoing_t {
        int timeout;
        struct splay_tree_t *config_tree;
        struct config_t *cfg;
-       struct addrinfo *ai;
+       struct addrinfo *ai; // addresses from config files
        struct addrinfo *aip;
+       struct addrinfo *nai; // addresses known via other online nodes (use free_known_addresses())
        timeout_t ev;
+       struct meshlink_handle *mesh;
 } outgoing_t;
 
 extern int maxoutbufsize;
 extern int addressfamily;
-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"
@@ -88,12 +88,13 @@ extern bool do_outgoing_connection(struct meshlink_handle *mesh, struct outgoing
 extern void handle_new_meta_connection(struct event_loop_t *loop, void *, int);
 extern int setup_listen_socket(const sockaddr_t *);
 extern int setup_vpn_in_socket(struct meshlink_handle *mesh, const sockaddr_t *);
-extern bool send_sptps_data(void *handle, uint8_t type, const char *data, size_t len);
-extern bool receive_sptps_record(void *handle, uint8_t type, const char *data, uint16_t len);
-extern void send_packet(struct node_t *, struct vpn_packet_t *);
-extern void receive_tcppacket(struct connection_t *, const char *, int);
-extern void broadcast_packet(const struct node_t *, struct vpn_packet_t *);
+extern bool send_sptps_data(void *handle, uint8_t type, const void *data, size_t len);
+extern bool receive_sptps_record(void *handle, uint8_t type, const void *data, uint16_t len);
+extern void send_packet(struct meshlink_handle *mesh, struct node_t *, struct vpn_packet_t *);
+extern void receive_tcppacket(struct meshlink_handle *mesh, struct connection_t *, const char *, int);
+extern void broadcast_packet(struct meshlink_handle *mesh, const struct node_t *, struct vpn_packet_t *);
 extern char *get_name(struct meshlink_handle *mesh);
+extern void load_all_nodes(struct meshlink_handle *mesh);
 extern bool setup_myself_reloadable(struct meshlink_handle *mesh);
 extern bool setup_network(struct meshlink_handle *mesh);
 extern void setup_outgoing_connection(struct meshlink_handle *mesh, struct outgoing_t *);
@@ -103,7 +104,8 @@ 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 void send_mtu_probe(struct node_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);
 
@@ -113,4 +115,4 @@ extern void retry(struct meshlink_handle *mesh);
 extern CRITICAL_SECTION mutex;
 #endif
 
-#endif /* __TINC_NET_H__ */
+#endif