From c322e8b7f50c69e112a9e079b2fd0ff589787ec8 Mon Sep 17 00:00:00 2001
From: Shelikhoo <xiaokangwang@outlook.com>
Date: Thu, 12 Sep 2024 14:35:03 +0100
Subject: [PATCH] always let WebRTCDialer constructor decide the clientID

---
 client/lib/rendezvous.go | 4 ++--
 client/lib/snowflake.go  | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/client/lib/rendezvous.go b/client/lib/rendezvous.go
index b961f28..cf44362 100644
--- a/client/lib/rendezvous.go
+++ b/client/lib/rendezvous.go
@@ -291,7 +291,7 @@ func NewWebRTCDialerWithNatPolicyAndEventsAndProxy(
 	eventLogger event.SnowflakeEventReceiver,
 	proxy *url.URL,
 ) *WebRTCDialer {
-	return NewWebRTCDialerWithNatPolicyAndEventsAndProxyAndClientID(
+	return newWebRTCDialerWithNatPolicyAndEventsAndProxyAndClientID(
 		broker,
 		natPolicy,
 		iceServers,
@@ -303,7 +303,7 @@ func NewWebRTCDialerWithNatPolicyAndEventsAndProxy(
 }
 
 // NewWebRTCDialerWithNatPolicyAndEventsAndProxy constructs a new WebRTCDialer.
-func NewWebRTCDialerWithNatPolicyAndEventsAndProxyAndClientID(
+func newWebRTCDialerWithNatPolicyAndEventsAndProxyAndClientID(
 	broker *BrokerChannel,
 	natPolicy *NATPolicy,
 	iceServers []webrtc.ICEServer,
diff --git a/client/lib/snowflake.go b/client/lib/snowflake.go
index 30a204c..82573c9 100644
--- a/client/lib/snowflake.go
+++ b/client/lib/snowflake.go
@@ -164,9 +164,8 @@ func NewSnowflakeClient(config ClientConfig) (*Transport, error) {
 		max = config.Max
 	}
 	eventsLogger := event.NewSnowflakeEventDispatcher()
-	clientID := turbotunnel.NewClientID()
 	transport := &Transport{
-		dialer:          NewWebRTCDialerWithNatPolicyAndEventsAndProxyAndClientID(broker, natPolicy, iceServers, max, eventsLogger, config.CommunicationProxy, clientID),
+		dialer:          NewWebRTCDialerWithNatPolicyAndEventsAndProxy(broker, natPolicy, iceServers, max, eventsLogger, config.CommunicationProxy),
 		eventDispatcher: eventsLogger,
 	}