archives/snowflake
2
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake.git synced 2025-10-14 14:11:23 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Call explicit frees in proxy-go

Browse source
This commit is contained in:
Arlo Breault 2018-03-05 18:06:51 -05:00
parent d0686b1c8d
commit ff8f385108
1 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
proxy-go/snowflake.go
View file

@ -76,7 +76,7 @@ func (c *webRTCConn) Write(b []byte) (int, error) {
} }
func (c *webRTCConn) Close() error { func (c *webRTCConn) Close() error {
return c.pc.Close() return c.pc.Destroy()
} }
func (c *webRTCConn) LocalAddr() net.Addr { func (c *webRTCConn) LocalAddr() net.Addr {
@ -271,6 +271,7 @@ func makePeerConnectionFromOffer(sdp *webrtc.SessionDescription, config *webrtc.
dc.OnClose = func() { dc.OnClose = func() {
log.Println("OnClose channel") log.Println("OnClose channel")
pw.Close() pw.Close()
pc.DeleteDataChannel(dc)
} }
dc.OnMessage = func(msg []byte) { dc.OnMessage = func(msg []byte) {
log.Printf("OnMessage <--- %d bytes", len(msg)) log.Printf("OnMessage <--- %d bytes", len(msg))
@ -289,7 +290,7 @@ func makePeerConnectionFromOffer(sdp *webrtc.SessionDescription, config *webrtc.
err = pc.SetRemoteDescription(sdp) err = pc.SetRemoteDescription(sdp)
if err != nil { if err != nil {
pc.Close() pc.Destroy()
return nil, fmt.Errorf("accept: SetRemoteDescription: %s", err) return nil, fmt.Errorf("accept: SetRemoteDescription: %s", err)
} }
log.Println("sdp offer successfully received.") log.Println("sdp offer successfully received.")
@ -311,11 +312,11 @@ func makePeerConnectionFromOffer(sdp *webrtc.SessionDescription, config *webrtc.
// Wait until answer is ready. // Wait until answer is ready.
select { select {
case err = <-errChan: case err = <-errChan:
pc.Close() pc.Destroy()
return nil, err return nil, err
case _, ok := <-answerChan: case _, ok := <-answerChan:
if !ok { if !ok {
pc.Close() pc.Destroy()
return nil, fmt.Errorf("Failed gathering ICE candidates.") return nil, fmt.Errorf("Failed gathering ICE candidates.")
} }
} }
@ -338,7 +339,7 @@ func runSession(sid string) {
err = sendAnswer(sid, pc) err = sendAnswer(sid, pc)
if err != nil { if err != nil {
log.Printf("error sending answer to client through broker: %s", err) log.Printf("error sending answer to client through broker: %s", err)
pc.Close() pc.Destroy()
retToken() retToken()
return return
} }