From 0df8f5d6159865f480183c3e6774f11cd36813b5 Mon Sep 17 00:00:00 2001
From: Julian Kornberger <jk+github@digineo.de>
Date: Tue, 18 Apr 2017 03:07:41 +0200
Subject: [PATCH] Remove Gateway field

---
 meshviewer/nodes_v1.go | 2 +-
 meshviewer/nodes_v2.go | 2 +-
 runtime/node.go        | 9 ++++++++-
 runtime/nodes.go       | 1 -
 runtime/stats.go       | 2 +-
 5 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/meshviewer/nodes_v1.go b/meshviewer/nodes_v1.go
index c8656ca..1ffadb0 100644
--- a/meshviewer/nodes_v1.go
+++ b/meshviewer/nodes_v1.go
@@ -33,7 +33,7 @@ func BuildNodesV1(nodes *runtime.Nodes) interface{} {
 			Lastseen:  nodeOrigin.Lastseen,
 			Flags: Flags{
 				Online:  nodeOrigin.Online,
-				Gateway: nodeOrigin.Gateway,
+				Gateway: nodeOrigin.IsGateway(),
 			},
 			Nodeinfo: nodeOrigin.Nodeinfo,
 		}
diff --git a/meshviewer/nodes_v2.go b/meshviewer/nodes_v2.go
index 61e524d..0500b39 100644
--- a/meshviewer/nodes_v2.go
+++ b/meshviewer/nodes_v2.go
@@ -30,7 +30,7 @@ func BuildNodesV2(nodes *runtime.Nodes) interface{} {
 			Lastseen:  nodeOrigin.Lastseen,
 			Flags: Flags{
 				Online:  nodeOrigin.Online,
-				Gateway: nodeOrigin.Gateway,
+				Gateway: nodeOrigin.IsGateway(),
 			},
 			Nodeinfo: nodeOrigin.Nodeinfo,
 		}
diff --git a/runtime/node.go b/runtime/node.go
index 4c857c3..cfd0ee7 100644
--- a/runtime/node.go
+++ b/runtime/node.go
@@ -13,8 +13,15 @@ type Node struct {
 	Firstseen  jsontime.Time    `json:"firstseen"`
 	Lastseen   jsontime.Time    `json:"lastseen"`
 	Online     bool             `json:"online"`
-	Gateway    bool             `json:"gateway"`
 	Statistics *data.Statistics `json:"statistics"`
 	Nodeinfo   *data.NodeInfo   `json:"nodeinfo"`
 	Neighbours *data.Neighbours `json:"-"`
 }
+
+// IsGateway returns whether the node is a gateway
+func (node *Node) IsGateway() bool {
+	if info := node.Nodeinfo; info != nil {
+		return info.VPN
+	}
+	return false
+}
diff --git a/runtime/nodes.go b/runtime/nodes.go
index fb6f7cb..012c109 100644
--- a/runtime/nodes.go
+++ b/runtime/nodes.go
@@ -63,7 +63,6 @@ func (nodes *Nodes) Update(nodeID string, res *data.ResponseData) *Node {
 	// Update nodeinfo
 	if val := res.NodeInfo; val != nil {
 		node.Nodeinfo = val
-		node.Gateway = val.VPN
 	}
 
 	// Update statistics
diff --git a/runtime/stats.go b/runtime/stats.go
index 53d0819..423a5f9 100644
--- a/runtime/stats.go
+++ b/runtime/stats.go
@@ -33,7 +33,7 @@ func NewGlobalStats(nodes *Nodes) (result *GlobalStats) {
 				result.ClientsWifi5 += stats.Clients.Wifi5
 				result.ClientsWifi += stats.Clients.Wifi
 			}
-			if node.Gateway {
+			if node.IsGateway() {
 				result.Gateways++
 			}
 			if info := node.Nodeinfo; info != nil {