From: Sergey Matveev <stargrave@stargrave.org>
Date: Sun, 3 Jul 2016 08:33:19 +0000 (+0300)
Subject: Move protocol argument check out of cycle
X-Git-Tag: 5.9^2~4
X-Git-Url: http://www.git.cypherpunks.ru/?p=govpn.git;a=commitdiff_plain;h=30b6d4fb42b7b2858339eb2d8b7a8aa21160db38

Move protocol argument check out of cycle
---

diff --git a/src/cypherpunks.ru/govpn/cmd/govpn-client/main.go b/src/cypherpunks.ru/govpn/cmd/govpn-client/main.go
index 3d8cbe6..5c51001 100644
--- a/src/cypherpunks.ru/govpn/cmd/govpn-client/main.go
+++ b/src/cypherpunks.ru/govpn/cmd/govpn-client/main.go
@@ -78,6 +78,12 @@ func main() {
 		govpn.EGDInit(*egdPath)
 	}
 
+	if *proxyAddr != "" {
+		*proto = "tcp"
+	}
+	if !(*proto == "udp" || *proto == "tcp") {
+		log.Fatalln("Unknown protocol specified")
+	}
 	if *verifierRaw == "" {
 		log.Fatalln("No verifier specified")
 	}
@@ -139,9 +145,6 @@ MainCycle:
 		timeouted := make(chan struct{})
 		rehandshaking := make(chan struct{})
 		termination := make(chan struct{})
-		if *proxyAddr != "" {
-			*proto = "tcp"
-		}
 		switch *proto {
 		case "udp":
 			go startUDP(timeouted, rehandshaking, termination)
@@ -151,8 +154,6 @@ MainCycle:
 			} else {
 				go startTCP(timeouted, rehandshaking, termination)
 			}
-		default:
-			log.Fatalln("Unknown protocol specified")
 		}
 		select {
 		case <-termSignal: