mirror
/
galene
mirror of https://github.com/jech/galene.git
1
Fork 0
Code

Send localDescription instead of original SDP.

This commit is contained in:
Juliusz Chroboczek 2021-01-11 20:27:39 +01:00
parent dad113c1f9
commit 820b303e84
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
rtpconn/webclient.go
View File

@ -464,7 +464,7 @@ func negotiate(c *webClient, down *rtpDownConnection, renegotiate, restartIce bo
Id: down.id, Id: down.id,
Source: source, Source: source,
Username: username, Username: username,
SDP: offer.SDP, SDP: down.pc.LocalDescription().SDP,
Labels: labels, Labels: labels,
}) })
} }
@ -527,7 +527,7 @@ func gotOffer(c *webClient, id string, sdp string, renegotiate bool, labels map[
return c.write(clientMessage{ return c.write(clientMessage{
Type: "answer", Type: "answer",
Id: id, Id: id,
SDP: answer.SDP, SDP: up.pc.LocalDescription().SDP,
}) })
} }

6
static/galene.js
View File

@ -2090,10 +2090,10 @@ async function relayTest() {
let offer = await pc1.createOffer(); let offer = await pc1.createOffer();
await pc1.setLocalDescription(offer); await pc1.setLocalDescription(offer);
await pc2.setRemoteDescription(offer); await pc2.setRemoteDescription(pc1.localDescription);
let answer = await pc2.createAnswer(); let answer = await pc2.createAnswer();
pc2.setLocalDescription(answer); await pc2.setLocalDescription(answer);
await pc1.setRemoteDescription(answer); await pc1.setRemoteDescription(pc2.localDescription);
pc2.ondatachannel = e => { pc2.ondatachannel = e => {
let d2 = e.channel; let d2 = e.channel;

4
static/protocol.js
View File

@ -595,7 +595,7 @@ ServerConnection.prototype.gotOffer = async function(id, labels, source, usernam
this.send({ this.send({
type: 'answer', type: 'answer',
id: id, id: id,
sdp: answer.sdp, sdp: c.pc.localDescription.sdp,
}); });
} catch(e) { } catch(e) {
try { try {
@ -1021,7 +1021,7 @@ Stream.prototype.negotiate = async function (restartIce) {
kind: this.localDescriptionSent ? 'renegotiate' : '', kind: this.localDescriptionSent ? 'renegotiate' : '',
id: c.id, id: c.id,
labels: c.labelsByMid, labels: c.labelsByMid,
sdp: offer.sdp, sdp: c.pc.localDescription.sdp,
}); });
this.localDescriptionSent = true; this.localDescriptionSent = true;
c.flushLocalIceCandidates(); c.flushLocalIceCandidates();