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

pull copyLoop out of goroutine, better pop and reset

Browse source
This commit is contained in:
Serene Han 2016-06-14 17:07:21 -07:00
parent a71c98c0ae
commit 2bf0e5457e
5 changed files with 70 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

21
client/snowflake.go
View file

@ -31,7 +31,7 @@ var handlerChan = make(chan int)
func ConnectLoop(snowflakes SnowflakeCollector) {
for {
// Check if ending is necessary.
err := snowflakes.Collect()
_, err := snowflakes.Collect()
if nil != err {
log.Println("WebRTC:", err,
" Retrying in", ReconnectTimeout, "seconds...")
@ -51,6 +51,7 @@ func socksAcceptLoop(ln *pt.SocksListener, snowflakes SnowflakeCollector) error
defer ln.Close()
log.Println("Started SOCKS listener.")
for {
log.Println("SOCKS listening...")
conn, err := ln.AcceptSocks()
log.Println("SOCKS accepted: ", conn.Req)
if err != nil {
@ -81,20 +82,22 @@ func handler(socks SocksConnector, snowflakes SnowflakeCollector) error {
return errors.New("handler: Received invalid Snowflake")
}
defer socks.Close()
log.Println("---- Snowflake assigned ----")
log.Println("---- Handler: snowflake assigned ----")
err := socks.Grant(&net.TCPAddr{IP: net.IPv4zero, Port: 0})
if err != nil {
return err
}
// Begin exchanging data.
// BUG(serene): There's a leak here when multiplexed.
go copyLoop(socks, snowflake)
go func() {
// When WebRTC resets, close the SOCKS connection, which ends
// the copyLoop below and induces new handler.
snowflake.WaitForReset()
socks.Close()
}()
// When WebRTC resets, close the SOCKS connection, which induces new handler.
// TODO: Double check this / fix it.
snowflake.WaitForReset()
log.Println("---- Closed ---")
// Begin exchanging data.
copyLoop(socks, snowflake)
log.Println("---- Handler: closed ---")
return nil
}