mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2025-12-06 14:33:10 -06:00
Code Issues Packages Projects Releases Wiki Activity

Use Context funcs

Browse source
This commit is contained in:
Till Faelligen 2024-09-22 14:49:39 +02:00
parent 5317fbea7c
commit 1fea81a150
No known key found for this signature in database
GPG key ID: 3DF82D8AB9211D4E
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
contrib/dendrite-demo-i2p/main_i2p.go
View file

@ -71,7 +71,7 @@ var (
) )
// Dial a network connection to an I2P server or a unix socket. Use Tor, or Fail for clearnet addresses. // 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 { if samError != nil {
return nil, samError return nil, samError
} }
@ -85,7 +85,7 @@ func Dial(network, addr string) (net.Conn, error) {
return nil, err return nil, err
} }
if strings.HasSuffix(url.Host, ".i2p") { if strings.HasSuffix(url.Host, ".i2p") {
return sam.Dial(network, addr) return sam.DialContext(ctx, network, addr)
} }
if terr != nil { if terr != nil {
return nil, terr return nil, terr
@ -93,7 +93,7 @@ func Dial(network, addr string) (net.Conn, error) {
if (tderr != nil) || (tdialer == nil) { if (tderr != nil) || (tdialer == nil) {
return nil, tderr return nil, tderr
} }
return tdialer.Dial(network, addr) return tdialer.DialContext(ctx, network, addr)
} }
//go:embed static/*.gotmpl //go:embed static/*.gotmpl
@ -109,7 +109,7 @@ func SetupAndServeHTTPS(
// create a transport that uses SAM to dial TCP Connections // create a transport that uses SAM to dial TCP Connections
httpClient := &http.Client{ httpClient := &http.Client{
Transport: &http.Transport{ Transport: &http.Transport{
Dial: Dial, DialContext: DialContext,
TLSClientConfig: &tls.Config{ TLSClientConfig: &tls.Config{
InsecureSkipVerify: true, InsecureSkipVerify: true,
}, },

6
contrib/dendrite-demo-tor/main_tor.go
View file

@ -60,7 +60,7 @@ var (
) )
// Dial either a unix socket address, or connect to a remote address over Tor. Always uses Tor. // 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 { if terr != nil {
return nil, terr return nil, terr
} }
@ -75,7 +75,7 @@ func Dial(network, addr string) (net.Conn, error) {
if err != nil { if err != nil {
return nil, err return nil, err
} }
return tdialer.Dial(network, url.Host) return tdialer.DialContext(ctx, network, url.Host)
} }
//go:embed static/*.gotmpl //go:embed static/*.gotmpl
@ -91,7 +91,7 @@ func SetupAndServeHTTPS(
// create a transport that uses SAM to dial TCP Connections // create a transport that uses SAM to dial TCP Connections
httpClient := &http.Client{ httpClient := &http.Client{
Transport: &http.Transport{ Transport: &http.Transport{
Dial: Dial, DialContext: DialContext,
TLSClientConfig: &tls.Config{ TLSClientConfig: &tls.Config{
InsecureSkipVerify: true, InsecureSkipVerify: true,
}, },