Reset UTCP timers after a succesful key exchange.

[meshlink] / src / net.h

diff --git a/src/net.h b/src/net.h
index 6a361a05d18722af781262d6ad96b35fc281ac0a..fa34dcf7eaa2faf6f87fcfdfb46c8508bc138e7e 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 __MESHLINK_NET_H__
-#define __MESHLINK_NET_H__
-
 #include "event.h"
 #include "sockaddr.h"
 
@@ -37,8 +37,8 @@
 
 typedef struct vpn_packet_t {
        struct {
-               unsigned int probe:1;
-               unsigned int tcp:1;
+               unsigned int probe: 1;
+               unsigned int tcp: 1;
        };
        uint16_t len;           /* the actual number of bytes in the `data' field */
        uint8_t data[MAXSIZE];
@@ -63,8 +63,9 @@ 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;
@@ -114,4 +115,4 @@ extern void retry(struct meshlink_handle *mesh);
 extern CRITICAL_SECTION mutex;
 #endif
 
-#endif /* __MESHLINK_NET_H__ */
+#endif