From: Sergey Matveev <stargrave@stargrave.org>
Date: Sun, 29 Mar 2015 08:50:36 +0000 (+0300)
Subject: Version should include compiler's version too
X-Git-Tag: 2.3^2~13
X-Git-Url: http://www.git.cypherpunks.ru/?a=commitdiff_plain;h=0f354841e3d85c65bfdb8086459e8f0bc8903ca7;p=govpn.git

Version should include compiler's version too

Signed-off-by: Sergey Matveev <stargrave@stargrave.org>
---

diff --git a/cmd/govpn-client/main.go b/cmd/govpn-client/main.go
index 82a89a6..8b621c8 100644
--- a/cmd/govpn-client/main.go
+++ b/cmd/govpn-client/main.go
@@ -86,7 +86,7 @@ func main() {
 	termSignal := make(chan os.Signal, 1)
 	signal.Notify(termSignal, os.Interrupt, os.Kill)
 
-	log.Println("Client version", govpn.Version)
+	log.Println(govpn.VersionGet())
 	log.Println("Starting handshake")
 	handshake := govpn.HandshakeStart(conn, remote, id, key)
 
diff --git a/cmd/govpn-server/main.go b/cmd/govpn-server/main.go
index 1ce5a37..b129f2d 100644
--- a/cmd/govpn-server/main.go
+++ b/cmd/govpn-server/main.go
@@ -116,7 +116,7 @@ func main() {
 	var ethEvent EthEvent
 	ethSink := make(chan EthEvent)
 
-	log.Println("Server version", govpn.Version)
+	log.Println(govpn.VersionGet())
 	log.Println("Server started")
 
 MainCycle:
diff --git a/common.go b/common.go
index 4d8442e..7eb4060 100644
--- a/common.go
+++ b/common.go
@@ -24,6 +24,7 @@ import (
 	"log"
 	"os"
 	"os/exec"
+	"runtime"
 )
 
 var (
@@ -76,3 +77,7 @@ func sliceZero(data []byte) {
 		data[i] = '\x00'
 	}
 }
+
+func VersionGet() string {
+	return "GoVPN version " + Version + " built with " + runtime.Version()
+}