Fix import cycles

This commit is contained in:
Toby
2021-04-27 20:18:43 -07:00
parent 5ac95d987a
commit 3667778ca7
13 changed files with 42 additions and 31 deletions

View File

@@ -2,6 +2,7 @@ package relay
import (
"github.com/tobyxdd/hysteria/pkg/core"
"github.com/tobyxdd/hysteria/pkg/transport"
"github.com/tobyxdd/hysteria/pkg/utils"
"net"
"time"
@@ -9,7 +10,7 @@ import (
type TCPRelay struct {
HyClient *core.Client
Transport core.Transport
Transport transport.Transport
ListenAddr *net.TCPAddr
Remote string
Timeout time.Duration
@@ -18,7 +19,7 @@ type TCPRelay struct {
ErrorFunc func(addr net.Addr, err error)
}
func NewTCPRelay(hyClient *core.Client, transport core.Transport, listen, remote string, timeout time.Duration,
func NewTCPRelay(hyClient *core.Client, transport transport.Transport, listen, remote string, timeout time.Duration,
connFunc func(addr net.Addr), errorFunc func(addr net.Addr, err error)) (*TCPRelay, error) {
tAddr, err := transport.LocalResolveTCPAddr(listen)
if err != nil {