From 5b4aed781f9fdf3339c785bb3b3b8e8f1bce0aad Mon Sep 17 00:00:00 2001 From: Maycon Santos Date: Sun, 17 Nov 2024 10:38:02 +0100 Subject: [PATCH] force temp relay --- client/internal/connect.go | 2 +- relay/client/client.go | 10 +++++++++- relay/client/dialer/quic/quic.go | 4 ++-- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/client/internal/connect.go b/client/internal/connect.go index d3665b9d0..416865b32 100644 --- a/client/internal/connect.go +++ b/client/internal/connect.go @@ -230,7 +230,7 @@ func (c *ConnectClient) run(mobileDependency MobileDependency, probes *ProbeHold c.statusRecorder.MarkSignalConnected() relayURLs, token := parseRelayInfo(loginResp) - relayManager := relayClient.NewManager(engineCtx, relayURLs, myPrivateKey.PublicKey().String()) + relayManager := relayClient.NewManager(engineCtx, []string{"rels://temp-relay-quic.relay.netbird.io:443"}, myPrivateKey.PublicKey().String()) c.statusRecorder.SetRelayMgr(relayManager) if len(relayURLs) > 0 { if token != nil { diff --git a/relay/client/client.go b/relay/client/client.go index a11a915cc..67b65516f 100644 --- a/relay/client/client.go +++ b/relay/client/client.go @@ -11,6 +11,7 @@ import ( auth "github.com/netbirdio/netbird/relay/auth/hmac" "github.com/netbirdio/netbird/relay/client/dialer/quic" + "github.com/netbirdio/netbird/relay/client/dialer/ws" "github.com/netbirdio/netbird/relay/healthcheck" "github.com/netbirdio/netbird/relay/messages" ) @@ -259,7 +260,14 @@ func (c *Client) Close() error { } func (c *Client) connect() error { - conn, err := quic.Dial(c.connectionURL) + var conn net.Conn + var err error + if c.connectionURL == "rels://temp-relay-quic.relay.netbird.io:443" { + log.Infof("connecting to relay server %s using quic protocol", c.connectionURL) + conn, err = quic.Dial(c.connectionURL) + } else { + conn, err = ws.Dial(c.connectionURL) + } if err != nil { return err } diff --git a/relay/client/dialer/quic/quic.go b/relay/client/dialer/quic/quic.go index 40772be97..2032793a6 100644 --- a/relay/client/dialer/quic/quic.go +++ b/relay/client/dialer/quic/quic.go @@ -26,8 +26,8 @@ func Dial(address string) (net.Conn, error) { defer cancel() tlsConf := &tls.Config{ - InsecureSkipVerify: true, // Set to true only for testing - NextProtos: []string{"netbird-relay"}, // Ensure this matches the server's ALPN + InsecureSkipVerify: true, // Set to true only for testing + NextProtos: []string{"h2"}, // Ensure this matches the server's ALPN } quicConfig := &quic.Config{