X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=src%2Fcypherpunks.ru%2Fgovpn%2Fcmd%2Fgovpn-client%2Fmain.go;h=36ff72a113e6ac0db3e809e90af6954fb57f9f6c;hb=a11b0bda178937e6891770f40f800d69b5640313;hp=98a5b21e6418953620a6b262e02ce69a028bb98b;hpb=0eee0e5c5315d5c0bf6004578783ba08bcda566b;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 98a5b21..36ff72a 100644
--- a/src/cypherpunks.ru/govpn/cmd/govpn-client/main.go
+++ b/src/cypherpunks.ru/govpn/cmd/govpn-client/main.go
@@ -34,7 +34,7 @@ import (
 var (
 	remoteAddr  = flag.String("remote", "", "Remote server address")
 	proto       = flag.String("proto", "udp", "Protocol to use: udp or tcp")
-	ifaceName   = flag.String("iface", "tap0", "TAP network interface")
+	ifaceName   = flag.String("iface", "tap0", "TUN/TAP network interface")
 	verifierRaw = flag.String("verifier", "", "Verifier")
 	keyPath     = flag.String("key", "", "Path to passphrase file")
 	upPath      = flag.String("up", "", "Path to up-script")
@@ -42,7 +42,7 @@ var (
 	stats       = flag.String("stats", "", "Enable stats retrieving on host:port")
 	proxyAddr   = flag.String("proxy", "", "Use HTTP proxy on host:port")
 	proxyAuth   = flag.String("proxy-auth", "", "user:password Basic proxy auth")
-	mtu         = flag.Int("mtu", govpn.MTUDefault, "MTU of TAP interface")
+	mtu         = flag.Int("mtu", govpn.MTUDefault, "MTU of TUN/TAP interface")
 	timeoutP    = flag.Int("timeout", 60, "Timeout seconds")
 	timeSync    = flag.Int("timesync", 0, "Time synchronization requirement")
 	noreconnect = flag.Bool("noreconnect", false, "Disable reconnection after timeout")
@@ -51,6 +51,7 @@ var (
 	cpr         = flag.Int("cpr", 0, "Enable constant KiB/sec out traffic rate")
 	egdPath     = flag.String("egd", "", "Optional path to EGD socket")
 	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")
 
 	conf        *govpn.PeerConf
@@ -67,6 +68,10 @@ func main() {
 		fmt.Println(govpn.Warranty)
 		return
 	}
+	if *version {
+		fmt.Println(govpn.VersionGet())
+		return
+	}
 	timeout = *timeoutP
 	var err error
 	log.SetFlags(log.Ldate | log.Lmicroseconds | log.Lshortfile)
@@ -122,7 +127,7 @@ func main() {
 
 	tap, err = govpn.TAPListen(*ifaceName, *mtu)
 	if err != nil {
-		log.Fatalln("Can not listen on TAP interface:", err)
+		log.Fatalln("Can not listen on TUN/TAP interface:", err)
 	}
 
 	if *stats != "" {