From e89e3adc691ed668d041cb4c3fb244156d800286 Mon Sep 17 00:00:00 2001
From: Matthias Radestock <matthias.radestock@gmail.com>
Date: Sun, 12 Apr 2015 10:45:49 +0100
Subject: [PATCH] cosmetic: more consistent param/arg/var ordering re Port

---
 router/router.go | 2 +-
 weaver/main.go   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/router/router.go b/router/router.go
index 89056f90..4e20dd57 100644
--- a/router/router.go
+++ b/router/router.go
@@ -18,6 +18,7 @@ const macMaxAge = 10 * time.Minute // [1]
 // /proc/sys/net/ipv4_neigh/*/base_reachable_time_ms on Linux
 
 type Router struct {
+	Port            int
 	Iface           *net.Interface
 	Ourself         *LocalPeer
 	Macs            *MacCache
@@ -31,7 +32,6 @@ type Router struct {
 	ConnLimit       int
 	BufSz           int
 	LogFrame        func(string, []byte, *layers.Ethernet)
-	Port            int
 }
 
 type PacketSource interface {
diff --git a/weaver/main.go b/weaver/main.go
index 5099ff54..87c8d129 100644
--- a/weaver/main.go
+++ b/weaver/main.go
@@ -36,6 +36,7 @@ func main() {
 
 	var (
 		justVersion bool
+		port        int
 		ifaceName   string
 		routerName  string
 		nickName    string
@@ -46,11 +47,11 @@ func main() {
 		peers       []string
 		connLimit   int
 		bufSz       int
-		port        int
 		httpAddr    string
 	)
 
 	flag.BoolVar(&justVersion, "version", false, "print version and exit")
+	flag.IntVar(&port, "port", weave.Port, "router port")
 	flag.StringVar(&ifaceName, "iface", "", "name of interface to capture/inject from (disabled if blank)")
 	flag.StringVar(&routerName, "name", "", "name of router (defaults to MAC of interface)")
 	flag.StringVar(&nickName, "nickname", "", "nickname of peer (defaults to hostname)")
@@ -60,7 +61,6 @@ func main() {
 	flag.StringVar(&prof, "profile", "", "enable profiling and write profiles to given path")
 	flag.IntVar(&connLimit, "connlimit", 30, "connection limit (0 for unlimited)")
 	flag.IntVar(&bufSz, "bufsz", 8, "capture buffer size in MB")
-	flag.IntVar(&port, "port", weave.Port, "router port")
 	flag.StringVar(&httpAddr, "httpaddr", fmt.Sprintf(":%d", weave.HTTPPort), "address to bind HTTP interface to (disabled if blank, absolute path indicates unix domain socket)")
 	flag.Parse()
 	peers = flag.Args()