From 08f1fd2f8dcee4c47de8702cd12f907702df564a Mon Sep 17 00:00:00 2001
From: thorkill <thkr@hannover.ccc.de>
Date: Sun, 8 May 2016 16:14:20 +0200
Subject: [PATCH] Fixes after merge with guus/1.1

---
 src/net_socket.c | 2 +-
 src/node.c       | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/net_socket.c b/src/net_socket.c
index 48d1b926..25cde5c0 100644
--- a/src/net_socket.c
+++ b/src/net_socket.c
@@ -547,7 +547,7 @@ begin:
 
 	/* Now that there is a working socket, fill in the rest and register this connection. */
 
-	c->last_ping_time = time(NULL);
+	c->last_ping_time = now;
 	c->status.connecting = true;
 	c->name = xstrdup(outgoing->name);
 #ifndef DISABLE_LEGACY
diff --git a/src/node.c b/src/node.c
index 39172b24..3899001a 100644
--- a/src/node.c
+++ b/src/node.c
@@ -172,9 +172,9 @@ void update_node_udp(node_t *n, const sockaddr_t *sa) {
 		free(n->hostname);
 		n->hostname = sockaddr2hostname(&n->address);
 		logger(DEBUG_PROTOCOL, LOG_DEBUG, "UDP address of %s set to %s", n->name, n->hostname);
-		n->status.has_known_address = true;
+		n->status.has_address = true;
 	} else {
-		n->status.has_known_address = false;
+		n->status.has_address = false;
 	}
 
 	/* invalidate UDP information - note that this is a security feature as well to make sure