1
Fork 0
mirror of https://github.com/jech/galene.git synced 2024-11-10 02:35:58 +01:00

Don't hide mismatches in the PeerConnection state automaton.

The previous behaviour led to silent failures, which was confusing.
This commit is contained in:
Juliusz Chroboczek 2021-02-02 22:57:56 +01:00
parent f4811e8cf5
commit f34ec0ab66

View file

@ -569,16 +569,12 @@ func gotAnswer(c *webClient, id string, sdp string) error {
return ErrUnknownId return ErrUnknownId
} }
if down.pc.SignalingState() == webrtc.SignalingStateStable { err := down.pc.SetRemoteDescription(webrtc.SessionDescription{
log.Printf("Got answer in stable state -- this shouldn't happen") Type: webrtc.SDPTypeAnswer,
} else { SDP: sdp,
err := down.pc.SetRemoteDescription(webrtc.SessionDescription{ })
Type: webrtc.SDPTypeAnswer, if err != nil {
SDP: sdp, return err
})
if err != nil {
return err
}
} }
for _, t := range down.tracks { for _, t := range down.tracks {
@ -590,7 +586,7 @@ func gotAnswer(c *webClient, id string, sdp string) error {
} }
} }
err := down.flushICECandidates() err = down.flushICECandidates()
if err != nil { if err != nil {
log.Printf("ICE: %v", err) log.Printf("ICE: %v", err)
} }