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

18
client/lib/snowflake.go
View file

@ -78,6 +78,8 @@ 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.
@ -164,7 +166,11 @@ func NewSnowflakeClient(config ClientConfig) (*Transport, error) {
max = config.Max
}
eventsLogger := event.NewSnowflakeEventDispatcher()
transport := &Transport{dialer: NewWebRTCDialerWithNatPolicyAndEventsAndProxy(broker, natPolicy, iceServers, max, eventsLogger, config.CommunicationProxy), eventDispatcher: eventsLogger}
clientID := turbotunnel.NewClientID()
transport := &Transport{
dialer: NewWebRTCDialerWithNatPolicyAndEventsAndProxy(broker, natPolicy, iceServers, max, eventsLogger, config.CommunicationProxy),
eventDispatcher: eventsLogger, clientID: clientID,
}
return transport, nil
}
@ -198,7 +204,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)
pconn, sess, err := newSession(snowflakes, t.clientID)
if err != nil {
return nil, err
}
@ -324,8 +330,11 @@ 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) (net.PacketConn, *smux.Session, error) {
func newSession(snowflakes SnowflakeCollector, clientIDCandid turbotunnel.ClientID) (net.PacketConn, *smux.Session, error) {
clientID := turbotunnel.NewClientID()
if clientIDCandid != (turbotunnel.ClientID{}) {
clientID = clientIDCandid
}
// We build a persistent KCP session on a sequence of ephemeral WebRTC
// connections. This dialContext tells RedialPacketConn how to get a new
@ -342,9 +351,8 @@ func newSession(snowflakes SnowflakeCollector) (net.PacketConn, *smux.Session, e
log.Println("---- Handler: snowflake assigned ----")
log.Printf("activeTransportMode = %c \n", conn.activeTransportMode)
if conn.activeTransportMode == 'u' {
packetIDConn := newPacketClientIDConn(clientID, conn)
packetConnWrapper := &packetConnWrapper{
ReadWriter: packetIDConn,
ReadWriter: conn,
remoteAddr: dummyAddr{},
localAddr: dummyAddr{},
}