archives/snowflake
2
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake.git synced 2025-10-13 20:11:19 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

always let WebRTCDialer constructor decide the clientID

Browse source
This commit is contained in:
Shelikhoo 2024-09-12 14:35:03 +01:00 • committed by WofWca
parent c7b163de57
commit c322e8b7f5
2 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
client/lib/rendezvous.go
View file

@ -291,7 +291,7 @@ func NewWebRTCDialerWithNatPolicyAndEventsAndProxy(
eventLogger event.SnowflakeEventReceiver, eventLogger event.SnowflakeEventReceiver,
proxy *url.URL, proxy *url.URL,
) *WebRTCDialer { ) *WebRTCDialer {
return NewWebRTCDialerWithNatPolicyAndEventsAndProxyAndClientID( return newWebRTCDialerWithNatPolicyAndEventsAndProxyAndClientID(
broker, broker,
natPolicy, natPolicy,
iceServers, iceServers,
@ -303,7 +303,7 @@ func NewWebRTCDialerWithNatPolicyAndEventsAndProxy(
} }
// NewWebRTCDialerWithNatPolicyAndEventsAndProxy constructs a new WebRTCDialer. // NewWebRTCDialerWithNatPolicyAndEventsAndProxy constructs a new WebRTCDialer.
func NewWebRTCDialerWithNatPolicyAndEventsAndProxyAndClientID( func newWebRTCDialerWithNatPolicyAndEventsAndProxyAndClientID(
broker *BrokerChannel, broker *BrokerChannel,
natPolicy *NATPolicy, natPolicy *NATPolicy,
iceServers []webrtc.ICEServer, iceServers []webrtc.ICEServer,

3
client/lib/snowflake.go
View file

@ -164,9 +164,8 @@ func NewSnowflakeClient(config ClientConfig) (*Transport, error) {
max = config.Max max = config.Max
} }
eventsLogger := event.NewSnowflakeEventDispatcher() eventsLogger := event.NewSnowflakeEventDispatcher()
clientID := turbotunnel.NewClientID()
transport := &Transport{ transport := &Transport{
dialer: NewWebRTCDialerWithNatPolicyAndEventsAndProxyAndClientID(broker, natPolicy, iceServers, max, eventsLogger, config.CommunicationProxy, clientID), dialer: NewWebRTCDialerWithNatPolicyAndEventsAndProxy(broker, natPolicy, iceServers, max, eventsLogger, config.CommunicationProxy),
eventDispatcher: eventsLogger, eventDispatcher: eventsLogger,
} }