go-gost/core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add dialer for connector

Browse Source
This commit is contained in:
ginuerzh
2022-09-08 22:39:17 +08:00
parent c546a6b711
commit e7a104651a
4 changed files with 31 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
chain/route.go
View File

@ -71,7 +71,9 @@ func (r *route) Dial(ctx context.Context, network, address string, opts ...DialO
cc, err := r.GetNode(r.Len()-1).transport.Connect(ctx, conn, network, address)
if err != nil {
conn.Close()
if conn != nil {
conn.Close()
}
return nil, err
}
return cc, nil

19
chain/transport.go
View File

@ -17,6 +17,7 @@ type Transport struct {
route Route
dialer dialer.Dialer
connector connector.Connector
timeout time.Duration
}
func (tr *Transport) Copy() *Transport {
@ -45,10 +46,15 @@ func (tr *Transport) WithConnector(connector connector.Connector) *Transport {
return tr
}
func (tr *Transport) WithTimeout(d time.Duration) *Transport {
tr.timeout = d
return tr
}
func (tr *Transport) Dial(ctx context.Context, addr string) (net.Conn, error) {
netd := &net_dialer.NetDialer{
Interface: tr.ifceName,
Timeout: 15 * time.Second,
Timeout: tr.timeout,
}
if tr.sockOpts != nil {
netd.Mark = tr.sockOpts.Mark
@ -81,7 +87,16 @@ func (tr *Transport) Handshake(ctx context.Context, conn net.Conn) (net.Conn, er
}
func (tr *Transport) Connect(ctx context.Context, conn net.Conn, network, address string) (net.Conn, error) {
return tr.connector.Connect(ctx, conn, network, address)
netd := &net_dialer.NetDialer{
Interface: tr.ifceName,
Timeout: tr.timeout,
}
if tr.sockOpts != nil {
netd.Mark = tr.sockOpts.Mark
}
return tr.connector.Connect(ctx, conn, network, address,
connector.NetDialerConnectOption(netd),
)
}
func (tr *Transport) Bind(ctx context.Context, conn net.Conn, network, address string, opts ...connector.BindOption) (net.Listener, error) {