From c95d3299276c0fba731e299d5deec8e9805e4ac1 Mon Sep 17 00:00:00 2001
From: Sergey Matveev <stargrave@stargrave.org>
Date: Thu, 8 Dec 2016 22:53:40 +0300
Subject: [PATCH] go fmt code

---
 src/cypherpunks.ru/govpn/client/client.go     | 17 +++++++-------
 src/cypherpunks.ru/govpn/client/proxy.go      |  2 +-
 .../govpn/cmd/govpn-client/main.go            | 22 +++++++++----------
 3 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/src/cypherpunks.ru/govpn/client/client.go b/src/cypherpunks.ru/govpn/client/client.go
index ac54a86..cfeba81 100644
--- a/src/cypherpunks.ru/govpn/client/client.go
+++ b/src/cypherpunks.ru/govpn/client/client.go
@@ -1,13 +1,14 @@
 package client
 
 import (
+	"errors"
 	"fmt"
 	"net"
 	"os"
-	"errors"
 	"time"
 
 	"github.com/agl/ed25519"
+
 	"cypherpunks.ru/govpn"
 )
 
@@ -34,7 +35,7 @@ type Configuration struct {
 
 func (c *Configuration) Validate() error {
 	if c.MTU > govpn.MTUMax {
-		return fmt.Errorf("Invalid MTU %d, maximum allowable is %d",c.MTU, govpn.MTUMax)
+		return fmt.Errorf("Invalid MTU %d, maximum allowable is %d", c.MTU, govpn.MTUMax)
 	}
 	if len(c.RemoteAddress) == 0 {
 		return errors.New("Missing RemoteAddress")
@@ -62,7 +63,7 @@ type Client struct {
 	config        Configuration
 
 	// Error receive any error of all routines
-	Error         chan error
+	Error chan error
 }
 
 func (c *Client) MainCycle() {
@@ -83,7 +84,7 @@ func (c *Client) MainCycle() {
 		go govpn.StatsProcessor(c.statsPort, &c.knownPeers)
 	}
 
-	MainCycle:
+MainCycle:
 	for {
 		c.timeouted = make(chan struct{})
 		c.rehandshaking = make(chan struct{})
@@ -124,11 +125,11 @@ func (c *Client) MainCycle() {
 
 func NewClient(conf Configuration, verifier *govpn.Verifier, termSignal chan os.Signal) *Client {
 	client := &Client{
-		idsCache: govpn.NewMACCache(),
+		idsCache:    govpn.NewMACCache(),
 		firstUpCall: true,
-		config: conf,
-		termSignal: termSignal,
-		Error: make(chan error, 1),
+		config:      conf,
+		termSignal:  termSignal,
+		Error:       make(chan error, 1),
 	}
 	confs := map[govpn.PeerId]*govpn.PeerConf{*verifier.Id: conf.Peer}
 	client.idsCache.Update(&confs)
diff --git a/src/cypherpunks.ru/govpn/client/proxy.go b/src/cypherpunks.ru/govpn/client/proxy.go
index 9f8e684..017536b 100644
--- a/src/cypherpunks.ru/govpn/client/proxy.go
+++ b/src/cypherpunks.ru/govpn/client/proxy.go
@@ -21,8 +21,8 @@ package client
 import (
 	"bufio"
 	"encoding/base64"
-	"net"
 	"fmt"
+	"net"
 	"net/http"
 
 	"cypherpunks.ru/govpn"
diff --git a/src/cypherpunks.ru/govpn/cmd/govpn-client/main.go b/src/cypherpunks.ru/govpn/cmd/govpn-client/main.go
index df426ba..d16245a 100644
--- a/src/cypherpunks.ru/govpn/cmd/govpn-client/main.go
+++ b/src/cypherpunks.ru/govpn/cmd/govpn-client/main.go
@@ -54,8 +54,8 @@ func main() {
 		syslog      = flag.Bool("syslog", false, "Enable logging to syslog")
 		version     = flag.Bool("version", false, "Print version information")
 		warranty    = flag.Bool("warranty", false, "Print warranty information")
-		protocol client.Protocol
-		err error
+		protocol    client.Protocol
+		err         error
 	)
 
 	flag.Parse()
@@ -123,16 +123,16 @@ func main() {
 			Verifier: verifier,
 			DSAPriv:  priv,
 		},
-		Protocol: protocol,
-		InterfaceName: *ifaceName,
-		ProxyAddress: *proxyAddr,
+		Protocol:            protocol,
+		InterfaceName:       *ifaceName,
+		ProxyAddress:        *proxyAddr,
 		ProxyAuthentication: *proxyAuth,
-		RemoteAddress: *remoteAddr,
-		UpPath: *upPath,
-		DownPath: *downPath,
-		StatsAddress: *stats,
-		NoReconnect: *noreconnect,
-		MTU: *mtu,
+		RemoteAddress:       *remoteAddr,
+		UpPath:              *upPath,
+		DownPath:            *downPath,
+		StatsAddress:        *stats,
+		NoReconnect:         *noreconnect,
+		MTU:                 *mtu,
 	}
 	if err = conf.Validate(); err != nil {
 		log.Fatalln("Invalid settings:", err)
-- 
2.44.0