From 7d6f85424cda898fc5ba766bf6e54fe2d952c130 Mon Sep 17 00:00:00 2001
From: David Wragg <david@wragg.org>
Date: Mon, 3 Aug 2015 14:06:23 +0100
Subject: [PATCH] Move OnOff into router.go

---
 common/utils.go  |  7 -------
 router/router.go | 11 +++++++++--
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/common/utils.go b/common/utils.go
index 95d6872b..0ac2ca08 100644
--- a/common/utils.go
+++ b/common/utils.go
@@ -6,10 +6,3 @@ func Assert(test bool) {
 		panic("Assertion failure")
 	}
 }
-
-func OnOff(b bool) string {
-	if b {
-		return "on"
-	}
-	return "off"
-}
diff --git a/router/router.go b/router/router.go
index 16f05dd6..a0cdb35d 100644
--- a/router/router.go
+++ b/router/router.go
@@ -120,8 +120,8 @@ func (router *Router) UsingPassword() bool {
 func (router *Router) Status() string {
 	var buf bytes.Buffer
 	fmt.Fprintln(&buf, "Our name is", router.Ourself)
-	fmt.Fprintln(&buf, "Encryption", OnOff(router.UsingPassword()))
-	fmt.Fprintln(&buf, "Peer discovery", OnOff(router.PeerDiscovery))
+	fmt.Fprintln(&buf, "Encryption", onOff(router.UsingPassword()))
+	fmt.Fprintln(&buf, "Peer discovery", onOff(router.PeerDiscovery))
 	fmt.Fprintln(&buf, "Sniffing traffic on", router.Iface)
 	fmt.Fprintf(&buf, "MACs:\n%s", router.Macs)
 	fmt.Fprintf(&buf, "Peers:\n%s", router.Peers)
@@ -130,6 +130,13 @@ func (router *Router) Status() string {
 	return buf.String()
 }
 
+func onOff(b bool) string {
+	if b {
+		return "on"
+	}
+	return "off"
+}
+
 func (router *Router) sniff(pio PacketSourceSink) {
 	Log.Println("Sniffing traffic on", router.Iface)