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

add client side support for extra data based client id

Browse source
This commit is contained in:
Shelikhoo 2024-04-29 14:53:02 +01:00 • committed by WofWca
parent ad5edd3f01
commit bf165264b1
3 changed files with 65 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

38
client/lib/rendezvous.go
View file

@ -13,6 +13,8 @@ import (
"sync"
"time"
"gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake/v2/common/turbotunnel"
"github.com/pion/webrtc/v4"
utls "github.com/refraction-networking/utls"
@ -249,8 +251,9 @@ type WebRTCDialer struct {
webrtcConfig *webrtc.Configuration
max int
eventLogger event.SnowflakeEventReceiver
proxy *url.URL
eventLogger event.SnowflakeEventReceiver
proxy *url.URL
connectionID turbotunnel.ClientID
}
// Deprecated: Use NewWebRTCDialerWithNatPolicyAndEventsAndProxy instead
@ -281,7 +284,6 @@ func NewWebRTCDialerWithEventsAndProxy(broker *BrokerChannel, iceServers []webrt
)
}
// NewWebRTCDialerWithNatPolicyAndEventsAndProxy constructs a new WebRTCDialer.
func NewWebRTCDialerWithNatPolicyAndEventsAndProxy(
broker *BrokerChannel,
natPolicy *NATPolicy,
@ -289,6 +291,27 @@ func NewWebRTCDialerWithNatPolicyAndEventsAndProxy(
max int,
eventLogger event.SnowflakeEventReceiver,
proxy *url.URL,
) *WebRTCDialer {
return NewWebRTCDialerWithNatPolicyAndEventsAndProxyAndClientID(
broker,
natPolicy,
iceServers,
max,
eventLogger,
proxy,
turbotunnel.NewClientID(),
)
}
// NewWebRTCDialerWithNatPolicyAndEventsAndProxy constructs a new WebRTCDialer.
func NewWebRTCDialerWithNatPolicyAndEventsAndProxyAndClientID(
broker *BrokerChannel,
natPolicy *NATPolicy,
iceServers []webrtc.ICEServer,
max int,
eventLogger event.SnowflakeEventReceiver,
proxy *url.URL,
clientID turbotunnel.ClientID,
) *WebRTCDialer {
config := webrtc.Configuration{
ICEServers: iceServers,
@ -300,8 +323,9 @@ func NewWebRTCDialerWithNatPolicyAndEventsAndProxy(
webrtcConfig: &config,
max: max,
eventLogger: eventLogger,
proxy: proxy,
eventLogger: eventLogger,
proxy: proxy,
connectionID: clientID,
}
}
@ -309,9 +333,7 @@ func NewWebRTCDialerWithNatPolicyAndEventsAndProxy(
func (w WebRTCDialer) Catch() (*WebRTCPeer, error) {
// TODO: [#25591] Fetch ICE server information from Broker.
// TODO: [#25596] Consider TURN servers here too.
return NewWebRTCPeerWithNatPolicyAndEventsAndProxy(
w.webrtcConfig, w.BrokerChannel, w.natPolicy, w.eventLogger, w.proxy,
)
return NewWebRTCPeerWithEventsAndProxy(w.webrtcConfig, w.BrokerChannel, w.eventLogger, w.proxy)
}
// GetMax returns the maximum number of snowflakes to collect.