X-Git-Url: http://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fnet.h;h=6d4dfc892e232dd32c8e27a379e84c85b034291c;hb=7c359313aca273319f94fe18121831ab4b62a4b4;hp=c3c82de348621688b07f41c911c57812a55a69b3;hpb=c544e5e8fe22250b230a46f0340483db5403a6c1;p=tinc diff --git a/src/net.h b/src/net.h index c3c82de3..6d4dfc89 100644 --- a/src/net.h +++ b/src/net.h @@ -1,3 +1,6 @@ +#ifndef TINC_NET_H +#define TINC_NET_H + /* net.h -- header for net.c Copyright (C) 1998-2005 Ivo Timmermans @@ -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" @@ -126,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; @@ -217,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); @@ -225,4 +225,4 @@ extern void try_tx(struct node_t *n, bool); #define closesocket(s) close(s) #endif -#endif /* __TINC_NET_H__ */ +#endif