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 82a89a69115a7b4edebf863ee06d5d9331ae09dc..8b621c8bdcfef50d57316dabd169202fa6e8ee57 100644 (file)
--- 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 1ce5a3748cd02d391f311f64adb6c090c0eaee84..b129f2dc2c37a19e5278eb40e570b810c5dae51b 100644 (file)
--- 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 4d8442ea3b679b5d238a287a2e7220b940559723..7eb40600c9fc0a868af4de56b26727a83b228736 100644 (file)
--- 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()
+}