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

clarify webRTCConn errorChannel and error handling

Browse source
This commit is contained in:
Serene Han 2016-03-10 17:14:36 -08:00
parent f91b8faa0a
commit ba7b59f80e
1 changed files with 16 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

24
client/webrtc.go
View file

@ -81,6 +81,8 @@ func NewWebRTCConnection(config *webrtc.Configuration,
connection.broker = broker connection.broker = broker
connection.offerChannel = make(chan *webrtc.SessionDescription, 1) connection.offerChannel = make(chan *webrtc.SessionDescription, 1)
connection.answerChannel = make(chan *webrtc.SessionDescription, 1) connection.answerChannel = make(chan *webrtc.SessionDescription, 1)
// Error channel is mostly for reporting during the initial SDP offer
// creation & local description setting, which happens asynchronously.
connection.errorChannel = make(chan error, 1) connection.errorChannel = make(chan error, 1)
connection.reset = make(chan struct{}, 1) connection.reset = make(chan struct{}, 1)
@ -103,8 +105,12 @@ func (c *webRTCConn) ConnectLoop() {
log.Println("Establishing WebRTC connection...") log.Println("Establishing WebRTC connection...")
// TODO: When go-webrtc is more stable, it's possible that a new // TODO: When go-webrtc is more stable, it's possible that a new
// PeerConnection won't need to be re-prepared each time. // PeerConnection won't need to be re-prepared each time.
c.preparePeerConnection() err := c.preparePeerConnection()
err := c.establishDataChannel() if err != nil {
log.Println("WebRTC: Could not create PeerConnection.")
break
}
err = c.establishDataChannel()
if err != nil { if err != nil {
log.Println("WebRTC: Could not establish DataChannel.") log.Println("WebRTC: Could not establish DataChannel.")
} else { } else {
@ -115,18 +121,19 @@ func (c *webRTCConn) ConnectLoop() {
<-time.After(time.Second * 1) <-time.After(time.Second * 1)
c.cleanup() c.cleanup()
} }
log.Println("WebRTC cannot connect.")
} }
// Create and prepare callbacks on a new WebRTC PeerConnection. // Create and prepare callbacks on a new WebRTC PeerConnection.
func (c *webRTCConn) preparePeerConnection() { func (c *webRTCConn) preparePeerConnection() error {
if nil != c.pc { if nil != c.pc {
c.pc.Close() c.pc.Close()
c.pc = nil c.pc = nil
} }
pc, err := webrtc.NewPeerConnection(c.config) pc, err := webrtc.NewPeerConnection(c.config)
if err != nil { if err != nil {
log.Printf("NewPeerConnection: %s", err) log.Printf("NewPeerConnection ERROR: %s", err)
c.errorChannel <- err return err
} }
// Prepare PeerConnection callbacks. // Prepare PeerConnection callbacks.
pc.OnNegotiationNeeded = func() { pc.OnNegotiationNeeded = func() {
@ -162,6 +169,7 @@ func (c *webRTCConn) preparePeerConnection() {
} }
c.pc = pc c.pc = pc
log.Println("WebRTC: PeerConnection created.") log.Println("WebRTC: PeerConnection created.")
return nil
} }
// Create a WebRTC DataChannel locally. // Create a WebRTC DataChannel locally.
@ -174,7 +182,7 @@ func (c *webRTCConn) establishDataChannel() error {
// an SDP offer while other goroutines operating on this struct handle the // an SDP offer while other goroutines operating on this struct handle the
// signaling. Eventually fires "OnOpen". // signaling. Eventually fires "OnOpen".
if err != nil { if err != nil {
log.Printf("CreateDataChannel: %s", err) log.Printf("CreateDataChannel ERROR: %s", err)
return err return err
} }
dc.OnOpen = func() { dc.OnOpen = func() {
@ -276,8 +284,8 @@ func (c *webRTCConn) exchangeSDP() error {
log.Printf("Received Answer:\n\n%s\n", answer.Sdp) log.Printf("Received Answer:\n\n%s\n", answer.Sdp)
err := c.pc.SetRemoteDescription(answer) err := c.pc.SetRemoteDescription(answer)
if nil != err { if nil != err {
log.Println("webrtc: Unable to SetRemoteDescription:", err) log.Println("WebRTC: Unable to SetRemoteDescription:", err)
// c.errorChannel <- err return err
} }
return nil return nil
} }