go vet/lint

[govpn.git] / src / cypherpunks.ru / govpn / cmd / govpn-client / main.go

diff --git a/src/cypherpunks.ru/govpn/cmd/govpn-client/main.go b/src/cypherpunks.ru/govpn/cmd/govpn-client/main.go
index df426ba8820c45bac23d84d83a21e814cf6e5540..8fcd988ecc8c6d1bb8bf3a688482df4751fa8c28 100644 (file)
--- a/src/cypherpunks.ru/govpn/cmd/govpn-client/main.go
+++ b/src/cypherpunks.ru/govpn/cmd/govpn-client/main.go
@@ -1,6 +1,6 @@
 /*
 GoVPN -- simple secure free software virtual private network daemon
-Copyright (C) 2014-2016 Sergey Matveev <stargrave@stargrave.org>
+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
@@ -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()
@@ -84,8 +84,7 @@ func main() {
        }
 
        if *proxyAddr != "" && protocol == client.ProtocolUDP {
-               log.Println("Proxy is supported for TCP only, switch")
-               protocol = client.ProtocolTCP
+               log.Fatalln("HTTP proxy is supported only in TCP mode")
        }
 
        if *verifierRaw == "" {
@@ -104,15 +103,12 @@ func main() {
                if protocol != client.ProtocolTCP {
                        log.Fatalln("Currently encryptionless mode works only with TCP")
                }
-               if !*noisy {
-                       log.Println("-encless is on, force -noisy mode")
-                       *noisy = true
-               }
+               *noisy = true
        }
        conf := client.Configuration{
                PrivateKey: priv,
                Peer: &govpn.PeerConf{
-                       Id:       verifier.Id,
+                       ID:       verifier.ID,
                        Iface:    *ifaceName,
                        MTU:      *mtu,
                        Timeout:  time.Second * time.Duration(*timeoutP),
@@ -123,16 +119,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)
@@ -148,9 +144,7 @@ func main() {
        signal.Notify(termSignal, os.Interrupt, os.Kill)
        c := client.NewClient(conf, verifier, termSignal)
        go c.MainCycle()
-       if err := <-c.Error; err != nil {
+       if err = <-c.Error; err != nil {
                log.Fatalln(err)
-       } else {
-               log.Println("Closed VPN tunnel")
        }
 }