go vet/lint

[govpn.git] / src / cypherpunks.ru / govpn / client / client.go

diff --git a/src/cypherpunks.ru/govpn/client/client.go b/src/cypherpunks.ru/govpn/client/client.go
index ac54a860e127c7d558de5d8b5f0b9dc4730647f4..8102cc6cdf1430217a27052526496b8c8af446a4 100644 (file)
--- a/src/cypherpunks.ru/govpn/client/client.go
+++ b/src/cypherpunks.ru/govpn/client/client.go
@@ -1,17 +1,36 @@
+/*
+GoVPN -- simple secure free software virtual private network daemon
+Copyright (C) 2014-2017 Sergey Matveev <stargrave@stargrave.org>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
 package client
 
 import (
+       "errors"
        "fmt"
        "net"
        "os"
-       "errors"
        "time"
 
        "github.com/agl/ed25519"
+
        "cypherpunks.ru/govpn"
 )
 
-type Protocol uint8
+type Protocol int
 
 const (
        ProtocolUDP Protocol = iota
@@ -26,7 +45,8 @@ type Configuration struct {
        ProxyAddress        string
        ProxyAuthentication string
        RemoteAddress       string
-       UpPath, DownPath    string
+       UpPath              string
+       DownPath            string
        StatsAddress        string
        NoReconnect         bool
        MTU                 int
@@ -34,7 +54,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")
@@ -61,8 +81,8 @@ type Client struct {
        termSignal    chan os.Signal
        config        Configuration
 
-       // Error receive any error of all routines
-       Error         chan error
+       // Error channel receives any kind of routine errors
+       Error chan error
 }
 
 func (c *Client) MainCycle() {
@@ -83,7 +103,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{})
@@ -102,14 +122,14 @@ func (c *Client) MainCycle() {
                case <-c.termSignal:
                        govpn.BothPrintf(`[finish remote="%s"]`, c.config.RemoteAddress)
                        c.termination <- struct{}{}
-                       // send a non-error to let know everything went fine
+                       // empty value signals that everything is fine
                        c.Error <- nil
                        break MainCycle
                case <-c.timeouted:
                        if c.config.NoReconnect {
                                break MainCycle
                        }
-                       govpn.BothPrintf(`[sleep seconds="%d"]`, c.config.Peer.Timeout)
+                       govpn.BothPrintf(`[sleep seconds="%d"]`, c.config.Peer.Timeout/time.Second)
                        time.Sleep(c.config.Peer.Timeout)
                case <-c.rehandshaking:
                }
@@ -117,20 +137,24 @@ func (c *Client) MainCycle() {
                close(c.rehandshaking)
                close(c.termination)
        }
-       if _, err = govpn.ScriptCall(c.config.DownPath, c.config.InterfaceName, c.config.RemoteAddress); err != nil {
+       if _, err = govpn.ScriptCall(
+               c.config.DownPath,
+               c.config.InterfaceName,
+               c.config.RemoteAddress,
+       ); err != nil {
                c.Error <- err
        }
 }
 
 func NewClient(conf Configuration, verifier *govpn.Verifier, termSignal chan os.Signal) *Client {
-       client := &Client{
-               idsCache: govpn.NewMACCache(),
+       client := Client{
+               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}
+       confs := map[govpn.PeerID]*govpn.PeerConf{*verifier.ID: conf.Peer}
        client.idsCache.Update(&confs)
-       return client
+       return &client
 }