X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=src%2Fcypherpunks.ru%2Fgovpn%2Fclient%2Fclient.go;h=8102cc6cdf1430217a27052526496b8c8af446a4;hb=f47fff1e42f75b736e7067ec06c2e81394833d46;hp=8e796f77e4c4249a11d9c9edf888e68f83a23b03;hpb=6bf20f1c34d1d6e4f93818a19cb7fe20f0e966c4;p=govpn.git

diff --git a/src/cypherpunks.ru/govpn/client/client.go b/src/cypherpunks.ru/govpn/client/client.go
index 8e796f7..8102cc6 100644
--- a/src/cypherpunks.ru/govpn/client/client.go
+++ b/src/cypherpunks.ru/govpn/client/client.go
@@ -1,3 +1,21 @@
+/*
+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 (
@@ -12,7 +30,7 @@ import (
 	"cypherpunks.ru/govpn"
 )
 
-type Protocol uint8
+type Protocol int
 
 const (
 	ProtocolUDP Protocol = iota
@@ -111,7 +129,7 @@ MainCycle:
 			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:
 		}
@@ -129,14 +147,14 @@ MainCycle:
 }
 
 func NewClient(conf Configuration, verifier *govpn.Verifier, termSignal chan os.Signal) *Client {
-	client := &Client{
+	client := Client{
 		idsCache:    govpn.NewMACCache(),
 		firstUpCall: true,
 		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
 }