From c7b163de57ebef3bb9e24fd6cd450c8633a6ca88 Mon Sep 17 00:00:00 2001 From: Shelikhoo Date: Thu, 12 Sep 2024 14:22:15 +0100 Subject: [PATCH] Remove clientID from unused branch --- client/lib/snowflake.go | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/client/lib/snowflake.go b/client/lib/snowflake.go index a3f3fec..30a204c 100644 --- a/client/lib/snowflake.go +++ b/client/lib/snowflake.go @@ -78,8 +78,6 @@ type Transport struct { // EventDispatcher is the event bus for snowflake events. // When an important event happens, it will be distributed here. eventDispatcher event.SnowflakeEventDispatcher - - clientID turbotunnel.ClientID } // ClientConfig defines how the SnowflakeClient will connect to the broker and Snowflake proxies. @@ -169,7 +167,7 @@ func NewSnowflakeClient(config ClientConfig) (*Transport, error) { clientID := turbotunnel.NewClientID() transport := &Transport{ dialer: NewWebRTCDialerWithNatPolicyAndEventsAndProxyAndClientID(broker, natPolicy, iceServers, max, eventsLogger, config.CommunicationProxy, clientID), - eventDispatcher: eventsLogger, clientID: clientID, + eventDispatcher: eventsLogger, } return transport, nil @@ -204,7 +202,7 @@ func (t *Transport) Dial() (net.Conn, error) { // Create a new smux session log.Printf("---- SnowflakeConn: starting a new session ---") - pconn, sess, err := newSession(snowflakes, t.clientID) + pconn, sess, err := newSession(snowflakes) if err != nil { return nil, err } @@ -330,7 +328,7 @@ func parseIceServers(addresses []string) []webrtc.ICEServer { // newSession returns a new smux.Session and the net.PacketConn it is running // over. The net.PacketConn successively connects through Snowflake proxies // pulled from snowflakes. -func newSession(snowflakes SnowflakeCollector, clientIDCandid turbotunnel.ClientID) (net.PacketConn, *smux.Session, error) { +func newSession(snowflakes SnowflakeCollector) (net.PacketConn, *smux.Session, error) { // We build a persistent KCP session on a sequence of ephemeral WebRTC // connections. This dialContext tells RedialPacketConn how to get a new // WebRTC connection when the previous one dies. Inside each WebRTC