X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fnet.h;h=1eed88d12aa166a1d3ff8bec9c9d891c2de66ce0;hb=5dec7459d9920c930bdfb3ac0f2a3740a6247ec0;hp=d2a60bcf685c858ef079f59b8d1b76305b609722;hpb=01eaeb3c9fa60ae9c6e5b866acd9baef79622d99;p=meshlink diff --git a/src/net.h b/src/net.h index d2a60bcf..1eed88d1 100644 --- 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 + Copyright (C) 2014, 2017 Guus Sliepen 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 __MESHLINK_NET_H__ -#define __MESHLINK_NET_H__ - #include "event.h" #include "sockaddr.h" @@ -63,15 +63,15 @@ 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; @@ -115,4 +115,4 @@ extern void retry(struct meshlink_handle *mesh); extern CRITICAL_SECTION mutex; #endif -#endif /* __MESHLINK_NET_H__ */ +#endif