diff --git a/binutils/binutils_linux.go b/binutils/binutils_linux.go index 148c3f7..f2ce0f5 100644 --- a/binutils/binutils_linux.go +++ b/binutils/binutils_linux.go @@ -1,16 +1,11 @@ package binutils import ( - "os" "os/exec" - "path" ) func RunTunnel() { - home := os.Getenv("HOME") - env := path.Join(home, ".wgenv") - - cmd := exec.Command("pkexec", BinPath("wireguard"), env, "--master") + cmd := exec.Command("pkexec", BinPath("wireguard"), Wgenv.Name(), "--master") wireguardCmd = cmd RunCmd(cmd) } diff --git a/binutils/set_env_darwin.go b/binutils/set_env_darwin.go index 174047a..2a98ab0 100644 --- a/binutils/set_env_darwin.go +++ b/binutils/set_env_darwin.go @@ -6,6 +6,7 @@ import ( "fmt" "os" "path" + "time" "github.com/inverse-inc/packetfence/go/sharedutils" ) @@ -13,7 +14,7 @@ import ( func init() { var err error tmp := os.Getenv("HOME") - Wgenv, err = os.OpenFile(path.Join(tmp, ".wgenv"), os.O_RDWR|os.O_CREATE, 0600) + Wgenv, err = os.OpenFile(path.Join(tmp, fmt.Sprintf(".wgenv-%d", time.Now().Unix())), os.O_RDWR|os.O_CREATE, 0600) sharedutils.CheckError(err) } diff --git a/binutils/set_env_linux.go b/binutils/set_env_linux.go index f55c5ad..859b5d8 100644 --- a/binutils/set_env_linux.go +++ b/binutils/set_env_linux.go @@ -6,6 +6,7 @@ import ( "fmt" "os" "path" + "time" "github.com/inverse-inc/packetfence/go/sharedutils" ) @@ -13,7 +14,7 @@ import ( func init() { var err error tmp := os.Getenv("HOME") - Wgenv, err = os.OpenFile(path.Join(tmp, ".wgenv"), os.O_RDWR|os.O_CREATE, 0600) + Wgenv, err = os.OpenFile(path.Join(tmp, fmt.Sprintf(".wgenv-%d", time.Now().Unix())), os.O_RDWR|os.O_CREATE, 0600) sharedutils.CheckError(err) } diff --git a/guiwrapper/main.go b/guiwrapper/main.go index 4b7ca79..df016df 100644 --- a/guiwrapper/main.go +++ b/guiwrapper/main.go @@ -3,6 +3,8 @@ package main import ( "context" "fmt" + "log" + "net/http" "os" "os/signal" "syscall" @@ -13,6 +15,8 @@ import ( "github.com/inverse-inc/wireguard-go/wgrpc" "github.com/inverse-inc/wireguard-go/ztn" "github.com/joho/godotenv" + + _ "net/http/pprof" ) var rpc = wgrpc.WGRPCClient() @@ -34,6 +38,11 @@ func main() { go binutils.CheckParentIsAlive(quit) + go func() { + //PPROF + log.Println(http.ListenAndServe("localhost:6061", nil)) + }() + setupExitSignals() SetupAPIClientGUI(func(runTunnel bool) { startTunnel(runTunnel) @@ -99,7 +108,7 @@ func checkTunnelStatus() { return } else { statusLabel.SetText(messages[status]) - UpdatePeers(ctx, rpc) + //UpdatePeers(ctx, rpc) } } diff --git a/main_shared.go b/main_shared.go index 46a8783..aa4abd7 100644 --- a/main_shared.go +++ b/main_shared.go @@ -19,6 +19,8 @@ import ( "github.com/inverse-inc/wireguard-go/wgrpc" "github.com/inverse-inc/wireguard-go/ztn" ps "github.com/mitchellh/go-ps" + + _ "net/http/pprof" ) var connection *ztn.Connection