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

Make exchangeSDP into a standalone function.

Browse source
This commit is contained in:
David Fifield 2020-04-23 22:33:38 -06:00
parent 8295c87fbe
commit 85277274fd
1 changed files with 12 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

32
client/lib/webrtc.go
View file

@ -21,7 +21,6 @@ type WebRTCPeer struct {
id string id string
pc *webrtc.PeerConnection pc *webrtc.PeerConnection
transport *webrtc.DataChannel transport *webrtc.DataChannel
broker *BrokerChannel
recvPipe *io.PipeReader recvPipe *io.PipeReader
writePipe *io.PipeWriter writePipe *io.PipeWriter
@ -47,7 +46,6 @@ func NewWebRTCPeer(config *webrtc.Configuration,
} }
connection.id = "snowflake-" + hex.EncodeToString(buf[:]) connection.id = "snowflake-" + hex.EncodeToString(buf[:])
} }
connection.broker = broker
// Override with something that's not NullLogger to have real logging. // Override with something that's not NullLogger to have real logging.
connection.BytesLogger = &BytesNullLogger{} connection.BytesLogger = &BytesNullLogger{}
@ -55,7 +53,7 @@ func NewWebRTCPeer(config *webrtc.Configuration,
// Pipes remain the same even when DataChannel gets switched. // Pipes remain the same even when DataChannel gets switched.
connection.recvPipe, connection.writePipe = io.Pipe() connection.recvPipe, connection.writePipe = io.Pipe()
err := connection.connect(config) err := connection.connect(config, broker)
if err != nil { if err != nil {
connection.Close() connection.Close()
return nil, err return nil, err
@ -113,7 +111,7 @@ func (c *WebRTCPeer) checkForStaleness() {
} }
} }
func (c *WebRTCPeer) connect(config *webrtc.Configuration) error { func (c *WebRTCPeer) connect(config *webrtc.Configuration, broker *BrokerChannel) error {
log.Println(c.id, " connecting...") log.Println(c.id, " connecting...")
// 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.
@ -127,8 +125,11 @@ func (c *WebRTCPeer) connect(config *webrtc.Configuration) error {
// nolint: golint // nolint: golint
return errors.New("WebRTC: Could not establish DataChannel") return errors.New("WebRTC: Could not establish DataChannel")
} }
err = c.exchangeSDP() answer := exchangeSDP(broker, c.pc.LocalDescription())
if err != nil { log.Printf("Received Answer.\n")
err = c.pc.SetRemoteDescription(*answer)
if nil != err {
log.Println("WebRTC: Unable to SetRemoteDescription:", err)
return err return err
} }
go c.checkForStaleness() go c.checkForStaleness()
@ -246,29 +247,20 @@ func (c *WebRTCPeer) establishDataChannel() error {
return nil return nil
} }
// exchangeSDP sends the local SDP offer to the Broker and awaits the SDP // exchangeSDP sends the local SDP offer to the Broker, awaits the SDP answer,
// answer. // and returns the answer.
func (c *WebRTCPeer) exchangeSDP() error { func exchangeSDP(broker *BrokerChannel, offer *webrtc.SessionDescription) *webrtc.SessionDescription {
// Keep trying the same offer until a valid answer arrives. // Keep trying the same offer until a valid answer arrives.
var answer *webrtc.SessionDescription
for { for {
var err error
// Send offer to broker (blocks). // Send offer to broker (blocks).
answer, err = c.broker.Negotiate(c.pc.LocalDescription()) answer, err := broker.Negotiate(offer)
if err == nil { if err == nil {
break return answer
} }
log.Printf("BrokerChannel Error: %s", err) log.Printf("BrokerChannel Error: %s", err)
log.Printf("Failed to retrieve answer. Retrying in %v", ReconnectTimeout) log.Printf("Failed to retrieve answer. Retrying in %v", ReconnectTimeout)
<-time.After(ReconnectTimeout) <-time.After(ReconnectTimeout)
} }
log.Printf("Received Answer.\n")
err := c.pc.SetRemoteDescription(*answer)
if nil != err {
log.Println("WebRTC: Unable to SetRemoteDescription:", err)
return err
}
return nil
} }
// Close all channels and transports // Close all channels and transports