Update all header guards.

[tinc] / src / net.h

diff --git a/src/net.h b/src/net.h
index 0c3d64c..6d4dfc8 100644 (file)
--- a/src/net.h
+++ b/src/net.h
@@ -1,7 +1,10 @@
+#ifndef TINC_NET_H
+#define TINC_NET_H
+
 /*
     net.h -- header for net.c
     Copyright (C) 1998-2005 Ivo Timmermans
-                  2000-2014 Guus Sliepen <guus@tinc-vpn.org>
+                  2000-2016 Guus Sliepen <guus@tinc-vpn.org>
 
     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
@@ -18,9 +21,6 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef __TINC_NET_H__
-#define __TINC_NET_H__
-
 #include "ipv6.h"
 #include "cipher.h"
 #include "digest.h"
@@ -115,6 +115,7 @@ typedef struct listen_socket_t {
        io_t udp;
        sockaddr_t sa;
        bool bindto;
+       int priority;
 } listen_socket_t;
 
 #include "conf.h"
@@ -125,8 +126,9 @@ typedef struct outgoing_t {
        int timeout;
        splay_tree_t *config_tree;
        struct config_t *cfg;
-       struct addrinfo *ai;
+       struct addrinfo *ai;  // addresses from config files
        struct addrinfo *aip;
+       struct addrinfo *kai; // addresses known via other online nodes (use free_known_addresses())
        timeout_t ev;
 } outgoing_t;
 
@@ -216,7 +218,6 @@ extern void regenerate_key(void);
 extern void purge(void);
 extern void retry(void);
 extern int reload_configuration(void);
-extern void load_all_subnets(void);
 extern void load_all_nodes(void);
 extern void try_tx(struct node_t *n, bool);
 
@@ -224,4 +225,4 @@ extern void try_tx(struct node_t *n, bool);
 #define closesocket(s) close(s)
 #endif
 
-#endif /* __TINC_NET_H__ */
+#endif