From a67fd4a8edc2dfe69f3d8cfcd64623dd52b60a9e Mon Sep 17 00:00:00 2001
From: Daniel LaCosse <3759828+daniellacosse@users.noreply.github.com>
Date: Fri, 8 Mar 2024 10:01:53 +0530
Subject: [PATCH] update Dial to DialStream

---
 client/.gitignore                                               | 2 --
 client/src/tun2socks/outline/connectivity/connectivity.go       | 2 +-
 client/src/tun2socks/outline/tun2socks/tcp.go                   | 2 +-
 .../OutlineService/bin/Release/OutlineService.exe.config        | 0
 4 files changed, 2 insertions(+), 4 deletions(-)
 rename {tools => client/tools}/OutlineService/OutlineService/bin/Release/OutlineService.exe.config (100%)

diff --git a/client/.gitignore b/client/.gitignore
index bee49f27f81..061ad13c3cf 100644
--- a/client/.gitignore
+++ b/client/.gitignore
@@ -13,9 +13,7 @@ Outline.apk
 Outline.apks
 packages/
 toc.pb
-tools/OutlineService/OutlineService/bin/*
 tools/smartdnsblock/bin/*
-!tools/OutlineService/OutlineService/bin/*.exe
 !tools/smartdnsblock/bin/*.exe
 universal.apk
 xcuserdata/
diff --git a/client/src/tun2socks/outline/connectivity/connectivity.go b/client/src/tun2socks/outline/connectivity/connectivity.go
index a05e5690b90..b6e9175bec0 100644
--- a/client/src/tun2socks/outline/connectivity/connectivity.go
+++ b/client/src/tun2socks/outline/connectivity/connectivity.go
@@ -119,7 +119,7 @@ func CheckTCPConnectivityWithHTTP(dialer transport.StreamDialer, targetURL strin
 	if !hasPort(targetAddr) {
 		targetAddr = net.JoinHostPort(targetAddr, "80")
 	}
-	conn, err := dialer.Dial(ctx, targetAddr)
+	conn, err := dialer.DialStream(ctx, targetAddr)
 	if err != nil {
 		return &reachabilityError{err}
 	}
diff --git a/client/src/tun2socks/outline/tun2socks/tcp.go b/client/src/tun2socks/outline/tun2socks/tcp.go
index 1bb6bd2c884..b1b92ac787c 100644
--- a/client/src/tun2socks/outline/tun2socks/tcp.go
+++ b/client/src/tun2socks/outline/tun2socks/tcp.go
@@ -33,7 +33,7 @@ func NewTCPHandler(client transport.StreamDialer) core.TCPConnHandler {
 }
 
 func (h *tcpHandler) Handle(conn net.Conn, target *net.TCPAddr) error {
-	proxyConn, err := h.dialer.Dial(context.Background(), target.String())
+	proxyConn, err := h.dialer.DialStream(context.Background(), target.String())
 	if err != nil {
 		return err
 	}
diff --git a/tools/OutlineService/OutlineService/bin/Release/OutlineService.exe.config b/client/tools/OutlineService/OutlineService/bin/Release/OutlineService.exe.config
similarity index 100%
rename from tools/OutlineService/OutlineService/bin/Release/OutlineService.exe.config
rename to client/tools/OutlineService/OutlineService/bin/Release/OutlineService.exe.config