Skip to content

Commit

Permalink
Fix config segfault, always show the version
Browse files Browse the repository at this point in the history
  • Loading branch information
kayrus committed Jun 3, 2020
1 parent 03fd40c commit 1bd69d8
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 16 deletions.
8 changes: 1 addition & 7 deletions cmd/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ package main

import (
"flag"
"fmt"
"log"
"os/user"

Expand All @@ -18,20 +17,15 @@ func main() {
var closeSession bool
var debug bool
var sel bool
var version bool
flag.StringVar(&server, "server", "", "")
flag.StringVar(&username, "username", "", "")
flag.StringVar(&password, "password", "", "")
flag.BoolVar(&closeSession, "close-session", false, "Close HTTPS VPN session on exit")
flag.BoolVar(&debug, "debug", false, "Show debug logs")
flag.BoolVar(&sel, "select", false, "Select a server from available F5 servers")
flag.BoolVar(&version, "version", false, "Show version")
flag.Parse()

if version {
fmt.Printf("gof5 version: %s\n", Version)
return
}
log.Printf("gof5 version: %s\n", Version)

if server == "" {
log.Fatal("Please define --server parameter")
Expand Down
12 changes: 12 additions & 0 deletions pkg/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,18 @@ func readConfig() (*Config, error) {
if err = yaml.Unmarshal(raw, &config); err != nil {
return nil, fmt.Errorf("cannot parse %s file: %v", configName, err)
}
} else {
log.Printf("Cannot read config file: %s", err)
log.Printf("Routes through VPN are not set, please set the routes in the config")
}

// set default driver
if config.Driver == "" {
config.Driver = "wireguard"
}

if !strSliceContains(supportedDrivers, config.Driver) {
return nil, fmt.Errorf("%q driver is unsupported, supported drivers are: %q", config.Driver, supportedDrivers)
}

// read current resolv.conf
Expand Down
9 changes: 0 additions & 9 deletions pkg/types.go
Original file line number Diff line number Diff line change
Expand Up @@ -179,15 +179,6 @@ func (r *Config) UnmarshalYAML(unmarshal func(interface{}) error) error {

*r = Config(s.tmp)

// set default driver
if r.Driver == "" {
r.Driver = "wireguard"
}

if !strSliceContains(supportedDrivers, r.Driver) {
return fmt.Errorf("%q driver is unsupported, supported drivers are: %q", r.Driver, supportedDrivers)
}

if s.ListenDNS != nil {
r.ListenDNS = net.ParseIP(*s.ListenDNS)
}
Expand Down

0 comments on commit 1bd69d8

Please sign in to comment.