From eccd448453558926e7d281467310ba32a8199ff9 Mon Sep 17 00:00:00 2001 From: bluepython508 <16466646+bluepython508@users.noreply.github.com> Date: Wed, 9 Apr 2025 01:14:14 +0100 Subject: [PATCH] Remove Forward struct that wasn't doing anything --- main.go | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/main.go b/main.go index c4a7a21..6120451 100644 --- a/main.go +++ b/main.go @@ -19,23 +19,17 @@ type Dialer struct{ addr string; } -type Forward struct{ - proto string; - port string; - dst string; -} - func (dialer Dialer) Dial() (net.Conn, error) { return net.Dial(dialer.proto, dialer.addr) } -func (forward Forward) Run(server *tsnet.Server, finish chan error) { - ln, err := server.Listen(forward.proto, fmt.Sprint(":", forward.port)) +func Forward(server *tsnet.Server, proto, port, dst string, finish chan error) { + ln, err = server.Listen(proto, fmt.Sprint(":", port)) defer ln.Close() if err != nil { finish <- err } - err = netforward.Forward(Dialer { proto: forward.proto, addr: forward.dst }, ln) + err = netforward.Forward(Dialer { proto: proto, addr: dst }, ln) if err != nil { finish <- err } @@ -61,9 +55,7 @@ func main() { for _, arg := range os.Args[2:] { args := strings.SplitN(arg, ":", 3) proto, port, dst := args[0], args[1], args[2] - go func() { - Forward { proto, port, dst }.Run(s, err_chan); - }(); + go Forward(s, proto, port, dst, err_chan); } err := <- err_chan log.Fatal(err)