X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=src%2Fcypherpunks.ru%2Fgovpn%2Fcmd%2Fgovpn-client%2Fmain.go;h=8fcd988ecc8c6d1bb8bf3a688482df4751fa8c28;hb=f47fff1e42f75b736e7067ec06c2e81394833d46;hp=d16245ac2de3b153abe22be7a8fa46be8c30cfe6;hpb=c95d3299276c0fba731e299d5deec8e9805e4ac1;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 d16245a..8fcd988 100644
--- 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
@@ -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),
@@ -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")
 	}
 }