dave/vpngate
1
0
Fork 0
mirror of https://github.com/davegallant/vpngate.git synced 2025-08-06 00:33:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add --reconnect flag (#43)

Browse Source 
* Allow --reconnect and --random to work in unison

* Fix goreleaser
This commit is contained in:
DG
2021-08-09 22:59:45 -04:00
committed by GitHub
parent 61f5779346
commit c3c4bb44ba
3 changed files with 47 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
cmd/connect.go
View File

@@ -18,9 +18,11 @@ import (
)
var flagRandom bool
var flagReconnect bool
func init() {
connectCmd.Flags().BoolVarP(&flagRandom, "random", "r", false, "connect to a random server")
connectCmd.Flags().BoolVarP(&flagReconnect, "reconnect", "t", false, "continually attempt to connect to the server")
rootCmd.AddCommand(connectCmd)
}
@@ -51,11 +53,7 @@ var connectCmd = &cobra.Command{
Options: serverSelection,
}
if flagRandom {
// Select a random server
rand.Seed(time.Now().UnixNano())
serverSelected = (*vpnServers)[rand.Intn(len(*vpnServers))]
} else {
if !flagRandom {
if len(args) > 0 {
selection = args[0]
@@ -80,37 +78,47 @@ var connectCmd = &cobra.Command{
}
}
decodedConfig, err := base64.StdEncoding.DecodeString(serverSelected.OpenVpnConfigData)
if err != nil {
log.Fatal().Msgf(err.Error())
os.Exit(1)
}
for {
tmpfile, err := ioutil.TempFile("", "vpngate-openvpn-config-")
if err != nil {
log.Fatal().Msgf(err.Error())
os.Exit(1)
}
if flagRandom {
// Select a random server
rand.Seed(time.Now().UnixNano())
serverSelected = (*vpnServers)[rand.Intn(len(*vpnServers))]
}
defer os.Remove(tmpfile.Name())
decodedConfig, err := base64.StdEncoding.DecodeString(serverSelected.OpenVpnConfigData)
if err != nil {
log.Fatal().Msgf(err.Error())
os.Exit(1)
}
if _, err := tmpfile.Write(decodedConfig); err != nil {
log.Fatal().Msgf(err.Error())
os.Exit(1)
}
tmpfile, err := ioutil.TempFile("", "vpngate-openvpn-config-")
if err != nil {
log.Fatal().Msgf(err.Error())
os.Exit(1)
}
if err := tmpfile.Close(); err != nil {
log.Fatal().Msgf(err.Error())
os.Exit(1)
}
if _, err := tmpfile.Write(decodedConfig); err != nil {
log.Fatal().Msgf(err.Error())
os.Exit(1)
}
log.Info().Msgf("Connecting to %s (%s) in %s", serverSelected.HostName, serverSelected.IPAddr, serverSelected.CountryLong)
if err := tmpfile.Close(); err != nil {
log.Fatal().Msgf(err.Error())
os.Exit(1)
}
err = vpn.Connect(tmpfile.Name())
log.Info().Msgf("Connecting to %s (%s) in %s", serverSelected.HostName, serverSelected.IPAddr, serverSelected.CountryLong)
err = vpn.Connect(tmpfile.Name())
if err != nil && !flagReconnect {
log.Fatal().Msgf(err.Error())
os.Exit(1)
} else {
os.Remove(tmpfile.Name())
}
if err != nil {
log.Fatal().Msgf(err.Error())
os.Exit(1)
}
},