diff --git a/cmd/wush/cp.go b/cmd/wush/cp.go index 42eaa8e..70faa3d 100644 --- a/cmd/wush/cp.go +++ b/cmd/wush/cp.go @@ -139,12 +139,10 @@ func cpCmd() *serpent.Command { go s.ListenAndServe(ctx) netns.SetDialerOverride(s.Dialer()) - ts, err := newTSNet("send") + ts, err := newTSNet("send", verbose) if err != nil { return err } - ts.Logf = func(string, ...any) {} - ts.UserLogf = func(string, ...any) {} logf("Bringing WireGuard up..") ts.Up(ctx) diff --git a/cmd/wush/portforward.go b/cmd/wush/portforward.go index 2965e48..e71a233 100644 --- a/cmd/wush/portforward.go +++ b/cmd/wush/portforward.go @@ -93,7 +93,7 @@ func portForwardCmd() *serpent.Command { go s.ListenAndServe(ctx) netns.SetDialerOverride(s.Dialer()) - ts, err := newTSNet("send") + ts, err := newTSNet("send", verbose) if err != nil { return err } diff --git a/cmd/wush/serve.go b/cmd/wush/serve.go index f28d135..6aafd8a 100644 --- a/cmd/wush/serve.go +++ b/cmd/wush/serve.go @@ -96,7 +96,7 @@ func serveCmd() *serpent.Command { go s.ListenAndServe(ctx) netns.SetDialerOverride(s.Dialer()) - ts, err := newTSNet("receive") + ts, err := newTSNet("receive", verbose) if err != nil { return err } @@ -213,7 +213,7 @@ func serveCmd() *serpent.Command { } } -func newTSNet(direction string) (*tsnet.Server, error) { +func newTSNet(direction string, verbose bool) (*tsnet.Server, error) { var err error tmp := os.TempDir() srv := new(tsnet.Server) @@ -223,13 +223,14 @@ func newTSNet(direction string) (*tsnet.Server, error) { srv.AuthKey = direction srv.ControlURL = "http://localhost:8080" srv.Logf = func(format string, args ...any) {} - // srv.Logf = func(format string, args ...any) { - // fmt.Printf(format+"\n", args...) - // } srv.UserLogf = func(format string, args ...any) {} - // srv.UserLogf = func(format string, args ...any) { - // fmt.Printf(format+"\n", args...) - // } + if verbose { + logf := func(format string, args ...any) { + fmt.Fprintf(os.Stderr, format+"\n", args...) + } + srv.Logf = logf + srv.UserLogf = logf + } srv.Store, err = store.New(func(format string, args ...any) {}, "mem:wush") if err != nil { diff --git a/cmd/wush/ssh.go b/cmd/wush/ssh.go index 8117c24..2546c9f 100644 --- a/cmd/wush/ssh.go +++ b/cmd/wush/ssh.go @@ -57,12 +57,10 @@ func sshCmd() *serpent.Command { go s.ListenAndServe(ctx) netns.SetDialerOverride(s.Dialer()) - ts, err := newTSNet("send") + ts, err := newTSNet("send", verbose) if err != nil { return err } - ts.Logf = func(string, ...any) {} - ts.UserLogf = func(string, ...any) {} logf("Bringing WireGuard up..") ts.Up(ctx)