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

move endWebRTC() mostly into webRTCConn.Close()

Browse source
This commit is contained in:
Serene Han 2016-02-26 14:35:15 -08:00
parent f3e0abe0e1
commit 5edac195f6
2 changed files with 42 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

18
client/snowflake.go
View file

@ -46,6 +46,8 @@ func copyLoop(a, b net.Conn) {
wg.Done()
}()
wg.Wait()
// a.Close()
// b.Close()
log.Println("copy loop ended")
}
@ -79,16 +81,8 @@ func endWebRTC() {
if nil == webrtcRemote {
return
}
if nil != webrtcRemote.snowflake {
s := webrtcRemote.snowflake
webrtcRemote.snowflake = nil
log.Printf("WebRTC: closing DataChannel")
s.Close()
}
if nil != webrtcRemote.pc {
log.Printf("WebRTC: closing PeerConnection")
webrtcRemote.pc.Close()
}
webrtcRemote.Close()
webrtcRemote = nil
}
// Establish a WebRTC channel for SOCKS connections.
@ -116,6 +110,7 @@ func handler(conn *pt.SocksConn) error {
// TODO: Make SOCKS acceptance more independent from WebRTC so they can
// be more easily interchanged.
copyLoop(conn, remote)
// <-remote.endChannel
log.Println("----END---")
return nil
}
@ -123,8 +118,9 @@ func handler(conn *pt.SocksConn) error {
func acceptLoop(ln *pt.SocksListener) error {
defer ln.Close()
for {
log.Println("SOCKS listening...")
log.Println("SOCKS listening...", ln)
conn, err := ln.AcceptSocks()
log.Println("accepting", conn, err)
if err != nil {
if e, ok := err.(net.Error); ok && e.Temporary() {
continue