From 1fea81a1509d260c47a05c3574dad51048288b57 Mon Sep 17 00:00:00 2001
From: Till Faelligen <2353100+S7evinK@users.noreply.github.com>
Date: Sun, 22 Sep 2024 14:49:39 +0200
Subject: [PATCH] Use Context funcs

---
 contrib/dendrite-demo-i2p/main_i2p.go | 8 ++++----
 contrib/dendrite-demo-tor/main_tor.go | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/contrib/dendrite-demo-i2p/main_i2p.go b/contrib/dendrite-demo-i2p/main_i2p.go
index 23d42ae6f..72fed656e 100644
--- a/contrib/dendrite-demo-i2p/main_i2p.go
+++ b/contrib/dendrite-demo-i2p/main_i2p.go
@@ -71,7 +71,7 @@ var (
 )
 
 // Dial a network connection to an I2P server or a unix socket. Use Tor, or Fail for clearnet addresses.
-func Dial(network, addr string) (net.Conn, error) {
+func DialContext(ctx context.Context, network, addr string) (net.Conn, error) {
 	if samError != nil {
 		return nil, samError
 	}
@@ -85,7 +85,7 @@ func Dial(network, addr string) (net.Conn, error) {
 		return nil, err
 	}
 	if strings.HasSuffix(url.Host, ".i2p") {
-		return sam.Dial(network, addr)
+		return sam.DialContext(ctx, network, addr)
 	}
 	if terr != nil {
 		return nil, terr
@@ -93,7 +93,7 @@ func Dial(network, addr string) (net.Conn, error) {
 	if (tderr != nil) || (tdialer == nil) {
 		return nil, tderr
 	}
-	return tdialer.Dial(network, addr)
+	return tdialer.DialContext(ctx, network, addr)
 }
 
 //go:embed static/*.gotmpl
@@ -109,7 +109,7 @@ func SetupAndServeHTTPS(
 	// create a transport that uses SAM to dial TCP Connections
 	httpClient := &http.Client{
 		Transport: &http.Transport{
-			Dial: Dial,
+			DialContext: DialContext,
 			TLSClientConfig: &tls.Config{
 				InsecureSkipVerify: true,
 			},
diff --git a/contrib/dendrite-demo-tor/main_tor.go b/contrib/dendrite-demo-tor/main_tor.go
index d41059c07..8f889c41a 100644
--- a/contrib/dendrite-demo-tor/main_tor.go
+++ b/contrib/dendrite-demo-tor/main_tor.go
@@ -60,7 +60,7 @@ var (
 )
 
 // Dial either a unix socket address, or connect to a remote address over Tor. Always uses Tor.
-func Dial(network, addr string) (net.Conn, error) {
+func DialContext(ctx context.Context, network, addr string) (net.Conn, error) {
 	if terr != nil {
 		return nil, terr
 	}
@@ -75,7 +75,7 @@ func Dial(network, addr string) (net.Conn, error) {
 	if err != nil {
 		return nil, err
 	}
-	return tdialer.Dial(network, url.Host)
+	return tdialer.DialContext(ctx, network, url.Host)
 }
 
 //go:embed static/*.gotmpl
@@ -91,7 +91,7 @@ func SetupAndServeHTTPS(
 	// create a transport that uses SAM to dial TCP Connections
 	httpClient := &http.Client{
 		Transport: &http.Transport{
-			Dial: Dial,
+			DialContext: DialContext,
 			TLSClientConfig: &tls.Config{
 				InsecureSkipVerify: true,
 			},