X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=src%2Fcypherpunks.ru%2Fgovpn%2Fcmd%2Fgovpn-client%2Fmain.go;h=4c2cd3d3717fa063d3438d3f2e5c74392092dd9b;hb=79f05cd5fc70602022f9844275fabbe98ba03ebe;hp=df426ba8820c45bac23d84d83a21e814cf6e5540;hpb=b69a57fb98ca6b03477487176021c2de053af5a7;p=govpn.git

diff --git a/src/cypherpunks.ru/govpn/cmd/govpn-client/main.go b/src/cypherpunks.ru/govpn/cmd/govpn-client/main.go
index df426ba..4c2cd3d 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()
@@ -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,10 +103,7 @@ 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,
@@ -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")
 	}
 }