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

Use uTLS aware broker channel constructor

Browse source
This commit is contained in:
Shelikhoo 2022-02-11 10:03:45 +00:00
parent ccfdcab8fe
commit 1573502e93
No known key found for this signature in database
GPG key ID: C4D5E79D22B25316
2 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
client/lib/rendezvous.go
View file

@ -56,13 +56,13 @@ func createBrokerTransport() http.RoundTripper {
} }
func NewBrokerChannel(broker, ampCache, front string, keepLocalAddresses bool) (*BrokerChannel, error) { func NewBrokerChannel(broker, ampCache, front string, keepLocalAddresses bool) (*BrokerChannel, error) {
return NewBrokerChannelWithUTlsClientID(broker, ampCache, front, keepLocalAddresses, "", false) return NewBrokerChannelWithUTlsSettings(broker, ampCache, front, keepLocalAddresses, "", false)
} }
// NewBrokerChannelWithUTlsClientID construct a new BrokerChannel, where: // NewBrokerChannelWithUTlsSettings construct a new BrokerChannel, where:
// |broker| is the full URL of the facilitating program which assigns proxies // |broker| is the full URL of the facilitating program which assigns proxies
// to clients, and |front| is the option fronting domain. // to clients, and |front| is the option fronting domain.
func NewBrokerChannelWithUTlsClientID(broker, ampCache, front string, keepLocalAddresses bool, utlsClientID string, removeSNI bool) (*BrokerChannel, error) { func NewBrokerChannelWithUTlsSettings(broker, ampCache, front string, keepLocalAddresses bool, utlsClientID string, removeSNI bool) (*BrokerChannel, error) {
log.Println("Rendezvous using Broker at:", broker) log.Println("Rendezvous using Broker at:", broker)
if ampCache != "" { if ampCache != "" {
log.Println("Through AMP cache at:", ampCache) log.Println("Through AMP cache at:", ampCache)

5
client/lib/snowflake.go
View file

@ -131,8 +131,9 @@ func NewSnowflakeClient(config ClientConfig) (*Transport, error) {
} }
// Rendezvous with broker using the given parameters. // Rendezvous with broker using the given parameters.
broker, err := NewBrokerChannel( broker, err := NewBrokerChannelWithUTlsSettings(
config.BrokerURL, config.AmpCacheURL, config.FrontDomain, config.KeepLocalAddresses) config.BrokerURL, config.AmpCacheURL, config.FrontDomain,
config.KeepLocalAddresses, config.UTlsClientID, config.UTlsRemoveSNI)
if err != nil { if err != nil {
return nil, err return nil, err
} }