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

refactor(proxy): improve NAT check logging

Browse source 
4ed5da7f2f introduced `OnError` but it did not print
failed periodic NAT type check errors - the error was simply
ignored.
This commit is contained in:
WofWca 2024-09-07 14:19:42 +04:00 • committed by Shelikhoo
parent 7f9fea5797
commit f44aa279fe
No known key found for this signature in database
GPG key ID: 4C9764E9FE80A3DC
1 changed files with 16 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

18
proxy/lib/snowflake.go
View file

@ -767,9 +767,9 @@ func (sf *SnowflakeProxy) Start() error {
NatRetestTask := task.Periodic{ NatRetestTask := task.Periodic{
Interval: sf.NATTypeMeasurementInterval, Interval: sf.NATTypeMeasurementInterval,
Execute: func() error { Execute: func() error {
sf.checkNATType(config, sf.NATProbeURL) return sf.checkNATType(config, sf.NATProbeURL)
return nil
}, },
// Not setting OnError would shut down the periodic task on error by default.
OnError: func(err error) { OnError: func(err error) {
log.Printf("Periodic probetest failed: %s, retaining current NAT type: %s", err.Error(), getCurrentNATType()) log.Printf("Periodic probetest failed: %s, retaining current NAT type: %s", err.Error(), getCurrentNATType())
}, },
@ -805,6 +805,8 @@ func (sf *SnowflakeProxy) Stop() {
// attempting to connect with a known symmetric NAT. If success, // attempting to connect with a known symmetric NAT. If success,
// it is considered "unrestricted". If timeout it is considered "restricted" // it is considered "unrestricted". If timeout it is considered "restricted"
func (sf *SnowflakeProxy) checkNATType(config webrtc.Configuration, probeURL string) error { func (sf *SnowflakeProxy) checkNATType(config webrtc.Configuration, probeURL string) error {
log.Printf("Checking our NAT type, contacting NAT check probe server at \"%v\"...", probeURL)
probe, err := newSignalingServer(probeURL, false) probe, err := newSignalingServer(probeURL, false)
if err != nil { if err != nil {
return fmt.Errorf("Error parsing url: %w", err) return fmt.Errorf("Error parsing url: %w", err)
@ -843,6 +845,7 @@ func (sf *SnowflakeProxy) checkNATType(config webrtc.Configuration, probeURL str
if err != nil { if err != nil {
return fmt.Errorf("Error setting answer: %w", err) return fmt.Errorf("Error setting answer: %w", err)
} }
log.Printf("Probetest answer: \n\t%s", strings.ReplaceAll(answer.SDP, "\n", "\n\t"))
err = pc.SetRemoteDescription(*answer) err = pc.SetRemoteDescription(*answer)
if err != nil { if err != nil {
@ -851,10 +854,21 @@ func (sf *SnowflakeProxy) checkNATType(config webrtc.Configuration, probeURL str
prevNATType := getCurrentNATType() prevNATType := getCurrentNATType()
log.Printf("Waiting for a test WebRTC connection with NAT check probe server to establish...")
select { select {
case <-dataChan: case <-dataChan:
log.Printf(
"Test WebRTC connection with NAT check probe server established!"+
" This means our NAT is %v!",
NATUnrestricted,
)
setCurrentNATType(NATUnrestricted) setCurrentNATType(NATUnrestricted)
case <-time.After(dataChannelTimeout): case <-time.After(dataChannelTimeout):
log.Printf(
"Test WebRTC connection with NAT check probe server timed out."+
" This means our NAT is %v.",
NATRestricted,
)
setCurrentNATType(NATRestricted) setCurrentNATType(NATRestricted)
} }