From 3682e7292736085087613f84cbc5908bae63268b Mon Sep 17 00:00:00 2001 From: Sergey Matveev Date: Mon, 7 Mar 2016 15:08:35 +0300 Subject: [PATCH] -warranty CLI option --- src/cypherpunks.ru/govpn/cmd/govpn-client/main.go | 6 ++++++ src/cypherpunks.ru/govpn/cmd/govpn-server/main.go | 6 ++++++ .../govpn/cmd/govpn-verifier/main.go | 5 +++++ src/cypherpunks.ru/govpn/govpn.go | 15 +++++++++++++++ 4 files changed, 32 insertions(+) diff --git a/src/cypherpunks.ru/govpn/cmd/govpn-client/main.go b/src/cypherpunks.ru/govpn/cmd/govpn-client/main.go index 032a288..58d5ce7 100644 --- a/src/cypherpunks.ru/govpn/cmd/govpn-client/main.go +++ b/src/cypherpunks.ru/govpn/cmd/govpn-client/main.go @@ -21,6 +21,7 @@ package main import ( "flag" + "fmt" "log" "net" "os" @@ -48,6 +49,7 @@ var ( encless = flag.Bool("encless", false, "Encryptionless mode") cpr = flag.Int("cpr", 0, "Enable constant KiB/sec out traffic rate") egdPath = flag.String("egd", "", "Optional path to EGD socket") + warranty = flag.Bool("warranty", false, "Print warranty information") conf *govpn.PeerConf tap *govpn.TAP @@ -59,6 +61,10 @@ var ( func main() { flag.Parse() + if *warranty { + fmt.Println(govpn.Warranty) + return + } timeout = *timeoutP var err error log.SetFlags(log.Ldate | log.Lmicroseconds | log.Lshortfile) diff --git a/src/cypherpunks.ru/govpn/cmd/govpn-server/main.go b/src/cypherpunks.ru/govpn/cmd/govpn-server/main.go index 5cddab8..606caf0 100644 --- a/src/cypherpunks.ru/govpn/cmd/govpn-server/main.go +++ b/src/cypherpunks.ru/govpn/cmd/govpn-server/main.go @@ -21,6 +21,7 @@ package main import ( "flag" + "fmt" "log" "net" "os" @@ -37,10 +38,15 @@ var ( stats = flag.String("stats", "", "Enable stats retrieving on host:port") proxy = flag.String("proxy", "", "Enable HTTP proxy on host:port") egdPath = flag.String("egd", "", "Optional path to EGD socket") + warranty = flag.Bool("warranty", false, "Print warranty information") ) func main() { flag.Parse() + if *warranty { + fmt.Println(govpn.Warranty) + return + } timeout := time.Second * time.Duration(govpn.TimeoutDefault) log.SetFlags(log.Ldate | log.Lmicroseconds | log.Lshortfile) log.Println(govpn.VersionGet()) diff --git a/src/cypherpunks.ru/govpn/cmd/govpn-verifier/main.go b/src/cypherpunks.ru/govpn/cmd/govpn-verifier/main.go index 5d59580..bdea079 100644 --- a/src/cypherpunks.ru/govpn/cmd/govpn-verifier/main.go +++ b/src/cypherpunks.ru/govpn/cmd/govpn-verifier/main.go @@ -35,10 +35,15 @@ var ( tOpt = flag.Int("t", govpn.DefaultT, "Argon2d iteration parameter") pOpt = flag.Int("p", govpn.DefaultP, "Argon2d parallelizm parameter") egdPath = flag.String("egd", "", "Optional path to EGD socket") + warranty = flag.Bool("warranty", false, "Print warranty information") ) func main() { flag.Parse() + if *warranty { + fmt.Println(govpn.Warranty) + return + } if *egdPath != "" { govpn.EGDInit(*egdPath) } diff --git a/src/cypherpunks.ru/govpn/govpn.go b/src/cypherpunks.ru/govpn/govpn.go index d65e72b..49a11cc 100644 --- a/src/cypherpunks.ru/govpn/govpn.go +++ b/src/cypherpunks.ru/govpn/govpn.go @@ -1,2 +1,17 @@ // Simple secure, DPI/censorship-resistant free software VPN daemon. package govpn + +const ( + Warranty = `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 +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see .` +) -- 2.44.0