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

fix: make NATPolicy thread-safe

Browse source 
Although it does not look like that there are situations
where it is critical to use a mutex, because it's only used
when performing rendezvous with a proxy, which doesn't happen
too frequently,
let's still do it just to be sure.
This commit is contained in:
WofWca 2025-03-02 15:38:23 +04:00
parent 1923803124
commit 4205121689
1 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
client/lib/rendezvous.go
View file

@ -11,6 +11,7 @@ import (
"net/http" "net/http"
"net/url" "net/url"
"sync" "sync"
"sync/atomic"
"time" "time"
"github.com/pion/webrtc/v4" "github.com/pion/webrtc/v4"
@ -186,8 +187,9 @@ func (bc *BrokerChannel) GetNATType() string {
return bc.natType return bc.natType
} }
// All of the methods of the struct are thread-safe.
type NATPolicy struct { type NATPolicy struct {
assumedUnrestrictedNATAndFailedToConnect bool assumedUnrestrictedNATAndFailedToConnect atomic.Bool
} }
// When our NAT type is unknown, we want to try to connect to a // When our NAT type is unknown, we want to try to connect to a
@ -199,7 +201,8 @@ type NATPolicy struct {
// This is useful when our STUN servers are blocked or don't support // This is useful when our STUN servers are blocked or don't support
// the NAT discovery feature, or if they're just slow. // the NAT discovery feature, or if they're just slow.
func (p *NATPolicy) NATTypeToSend(actualNatType string) string { func (p *NATPolicy) NATTypeToSend(actualNatType string) string {
if !p.assumedUnrestrictedNATAndFailedToConnect && actualNatType == nat.NATUnknown { if !p.assumedUnrestrictedNATAndFailedToConnect.Load() &&
actualNatType == nat.NATUnknown {
// If our NAT type is unknown, and we haven't failed to connect // If our NAT type is unknown, and we haven't failed to connect
// with a spoofed NAT type yet, then spoof a NATUnrestricted // with a spoofed NAT type yet, then spoof a NATUnrestricted
// type. // type.
@ -236,7 +239,7 @@ func (p *NATPolicy) Failure(actualNATType, sentNATType string) {
"is \"%v\", and failed. Let's not do that again.", "is \"%v\", and failed. Let's not do that again.",
actualNATType, actualNATType,
) )
p.assumedUnrestrictedNATAndFailedToConnect = true p.assumedUnrestrictedNATAndFailedToConnect.Store(true)
} }
} }