mirror of
https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake.git
synced 2025-10-13 20:11:19 -04:00
Close SocksConn when WebRTC connection is reset
* This will induce the tor client to establish a new SocksConn, which in turn will dial a new WebRTC connection. To be improved upon. * Part of #12
This commit is contained in:
parent
cf1b0a49f1
commit
598e2a3bfb
2 changed files with 23 additions and 20 deletions
|
@ -99,6 +99,12 @@ func handler(conn *pt.SocksConn) error {
|
|||
defer remote.Close()
|
||||
webrtcRemote = remote
|
||||
|
||||
// Induce another call to handler
|
||||
go func() {
|
||||
<-remote.reset
|
||||
conn.Close()
|
||||
}()
|
||||
|
||||
err = conn.Grant(&net.TCPAddr{IP: net.IPv4zero, Port: 0})
|
||||
if err != nil {
|
||||
return err
|
||||
|
|
|
@ -101,14 +101,13 @@ func NewWebRTCConnection(config *webrtc.Configuration,
|
|||
|
||||
// WebRTC re-establishment loop. Expected in own goroutine.
|
||||
func (c *webRTCConn) ConnectLoop() {
|
||||
for {
|
||||
log.Println("Establishing WebRTC connection...")
|
||||
// TODO: When go-webrtc is more stable, it's possible that a new
|
||||
// PeerConnection won't need to be re-prepared each time.
|
||||
err := c.preparePeerConnection()
|
||||
if err != nil {
|
||||
log.Println("WebRTC: Could not create PeerConnection.")
|
||||
break
|
||||
return
|
||||
}
|
||||
err = c.establishDataChannel()
|
||||
if err != nil {
|
||||
|
@ -120,8 +119,6 @@ func (c *webRTCConn) ConnectLoop() {
|
|||
}
|
||||
<-time.After(time.Second * 1)
|
||||
c.cleanup()
|
||||
}
|
||||
log.Println("WebRTC cannot connect.")
|
||||
}
|
||||
|
||||
// Create and prepare callbacks on a new WebRTC PeerConnection.
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue