Stylistic fixes

diff --git a/src/cypherpunks.ru/govpn/common.go b/src/cypherpunks.ru/govpn/common.go
index ca629c06317ec50f4c5f3608e18846bdd29459a4..002b1fbfd43a55ba72c8a6704b93abd550dbb86f 100644 (file)
--- a/src/cypherpunks.ru/govpn/common.go
+++ b/src/cypherpunks.ru/govpn/common.go
@@ -146,12 +146,12 @@ func SliceZero(data []byte) {
        }
 }
 
-// VersionGet return version of GoVPN
+// VersionGet returns version of GoVPN
 func VersionGet() string {
        return "GoVPN version " + Version + " built with " + runtime.Version()
 }
 
-// CatchSignalShutdown return a channel.
+// CatchSignalShutdown returns a channel.
 // that channel will get a SIG_INT or SIG_KILL signal is received
 // this is intended to be used to stop a client/server
 func CatchSignalShutdown() chan interface{} {

diff --git a/src/cypherpunks.ru/govpn/handshake.go b/src/cypherpunks.ru/govpn/handshake.go
index bc963d1204d7d914202d2731df51e1cdb550f0d5..c310fded72b7fa0806075667c78248856a30f62a 100644 (file)
--- a/src/cypherpunks.ru/govpn/handshake.go
+++ b/src/cypherpunks.ru/govpn/handshake.go
@@ -163,15 +163,13 @@ func idTag(id *PeerID, timeSync int, data []byte) ([]byte, error) {
        return sum[len(sum)-8:], nil
 }
 
-// HandshakeStarts start handshake's procedure from the client.
+// HandshakeStarts starts handshake's procedure from the client.
 // It is the entry point for starting the handshake procedure.
 // First handshake packet will be sent immediately.
 func HandshakeStart(addr string, conn io.Writer, conf *PeerConf) (*Handshake, error) {
        state := NewHandshake(addr, conn, conf)
-       var (
-               dhPubRepr *[32]byte
-               err       error
-       )
+       var dhPubRepr *[32]byte
+       var err error
        if state.dhPriv, dhPubRepr, err = dhKeypairGen(); err != nil {
                return nil, errors.Wrap(err, "dhKeypairGen")
        }

diff --git a/src/cypherpunks.ru/govpn/logger.go b/src/cypherpunks.ru/govpn/logger.go
index cd7eabb48e55a5014f3c9fea5521a17eab727e77..02dc2ae911f541976e648904f84d02e4971d210c 100644 (file)
--- a/src/cypherpunks.ru/govpn/logger.go
+++ b/src/cypherpunks.ru/govpn/logger.go
@@ -58,7 +58,8 @@ func (sf *syslogFormatter) Format(entry *logrus.Entry) ([]byte, error) {
        return buf.Bytes(), nil
 }
 
-// NewLogger returns a logger for specified level. Syslog or Windows Events can be turned on.
+// NewLogger returns a logger for specified level. Syslog or Windows
+// Events can be turned on.
 func NewLogger(level string, syslog bool) (*logrus.Logger, error) {
        var logger *logrus.Logger
        logLevel, err := logrus.ParseLevel(level)

diff --git a/src/cypherpunks.ru/govpn/peer.go b/src/cypherpunks.ru/govpn/peer.go
index 54bef040ea1cece2d9f65a4a5acf24a0b6171fb1..24f694557844216cc5610c87978b069dc0a75f27 100644 (file)
--- a/src/cypherpunks.ru/govpn/peer.go
+++ b/src/cypherpunks.ru/govpn/peer.go
@@ -139,7 +139,8 @@ type Peer struct {
        noncesT  chan *[NonceSize]byte
 }
 
-// LogFields return a logrus compatible Fields to identity a single peer in logs
+// LogFields returns a logrus compatible Fields to identity a single
+// peer in logs
 func (p *Peer) LogFields() logrus.Fields {
        return logrus.Fields{
                logPrefixPeer + "addr":        p.Addr,
@@ -149,8 +150,9 @@ func (p *Peer) LogFields() logrus.Fields {
        }
 }
 
-// ConfigurationLogFields return a logrus compatible Fields with the settings of
-// a single peer. Complement LogFields() for extra debugging details.
+// ConfigurationLogFields returns a logrus compatible Fields with the
+// settings of a single peer. Complement LogFields() for extra debugging
+// details.
 func (p *Peer) ConfigurationLogFields() logrus.Fields {
        return logrus.Fields{
                logPrefixPeer + "timeout":  p.Timeout.String(),