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

Export ability to change the URL of NAT probe

Browse source
This commit is contained in:
Cecylia Bocovich 2021-10-26 15:43:36 -04:00
parent 3caa83d84d
commit 0a2598a1e8
1 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

11
proxy/lib/snowflake.go
View file

@ -49,7 +49,7 @@ import (
const DefaultBrokerURL = "https://snowflake-broker.torproject.net/" const DefaultBrokerURL = "https://snowflake-broker.torproject.net/"
const DefaultProbeURL = "https://snowflake-broker.torproject.net:8443/probe" const DefaultNATProbeURL = "https://snowflake-broker.torproject.net:8443/probe"
const DefaultRelayURL = "wss://snowflake.bamsoftware.com/" const DefaultRelayURL = "wss://snowflake.bamsoftware.com/"
@ -99,7 +99,9 @@ type SnowflakeProxy struct {
KeepLocalAddresses bool KeepLocalAddresses bool
// RelayURL is the URL of the Snowflake server that all traffic will be relayed to // RelayURL is the URL of the Snowflake server that all traffic will be relayed to
RelayURL string RelayURL string
shutdown chan struct{} // NATProbeURL is the URL of the probe service we use for NAT checks
NATProbeURL string
shutdown chan struct{}
} }
// Checks whether an IP address is a remote address for the client // Checks whether an IP address is a remote address for the client
@ -499,6 +501,9 @@ func (sf *SnowflakeProxy) Start() error {
if sf.STUNURL == "" { if sf.STUNURL == "" {
sf.STUNURL = DefaultSTUNURL sf.STUNURL = DefaultSTUNURL
} }
if sf.NATProbeURL == "" {
sf.NATProbeURL = DefaultNATProbeURL
}
broker, err = newSignalingServer(sf.BrokerURL, sf.KeepLocalAddresses) broker, err = newSignalingServer(sf.BrokerURL, sf.KeepLocalAddresses)
if err != nil { if err != nil {
@ -524,7 +529,7 @@ func (sf *SnowflakeProxy) Start() error {
tokens = newTokens(sf.Capacity) tokens = newTokens(sf.Capacity)
// use probetest to determine NAT compatability // use probetest to determine NAT compatability
sf.checkNATType(config, DefaultProbeURL) sf.checkNATType(config, sf.NATProbeURL)
log.Printf("NAT type: %s", currentNATType) log.Printf("NAT type: %s", currentNATType)
ticker := time.NewTicker(pollInterval) ticker := time.NewTicker(pollInterval)