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

Merge remote-tracking branch 'gitlab/mr/187'

Browse source
This commit is contained in:
meskio 2023-10-26 18:47:01 +02:00
commit 778e3af09a
No known key found for this signature in database
GPG key ID: 52B8F5AC97A2DA86
2 changed files with 33 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

21
broker/ipc.go
View file

@ -233,22 +233,19 @@ func (i *IPC) ClientOffers(arg messages.Arg, response *[]byte) error {
}
func (i *IPC) matchSnowflake(natType string) *Snowflake {
// Only hand out known restricted snowflakes to unrestricted clients
var snowflakeHeap *SnowflakeHeap
if natType == NATUnrestricted {
snowflakeHeap = i.ctx.restrictedSnowflakes
} else {
snowflakeHeap = i.ctx.snowflakes
}
i.ctx.snowflakeLock.Lock()
defer i.ctx.snowflakeLock.Unlock()
if snowflakeHeap.Len() > 0 {
return heap.Pop(snowflakeHeap).(*Snowflake)
} else {
return nil
// Proiritize known restricted snowflakes for unrestricted clients
if natType == NATUnrestricted && i.ctx.restrictedSnowflakes.Len() > 0 {
return heap.Pop(i.ctx.restrictedSnowflakes).(*Snowflake)
}
if i.ctx.snowflakes.Len() > 0 {
return heap.Pop(i.ctx.snowflakes).(*Snowflake)
}
return nil
}
func (i *IPC) ProxyAnswers(arg messages.Arg, response *[]byte) error {