Merge from remote branch

2021-07-28 22:13:21 +08:00
parent 09299e5e5a 3705996974
commit ba2fd00f01
33 changed files with 1549 additions and 142 deletions
--- a/adapter/outbound/direct.go
+++ b/adapter/outbound/direct.go
@ -14,9 +14,7 @@ type Direct struct {

 // DialContext implements C.ProxyAdapter
 func (d *Direct) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) {
-	address := net.JoinHostPort(metadata.String(), metadata.DstPort)
-
-	c, err := dialer.DialContext(ctx, "tcp", address)
+	c, err := dialer.DialContext(ctx, "tcp", metadata.RemoteAddress())
 	if err != nil {
 		return nil, err
 	}