Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
galene
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
galene
Commits
820b303e
Commit
820b303e
authored
Jan 11, 2021
by
Juliusz Chroboczek
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Send localDescription instead of original SDP.
parent
dad113c1
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
7 deletions
+7
-7
rtpconn/webclient.go
rtpconn/webclient.go
+2
-2
static/galene.js
static/galene.js
+3
-3
static/protocol.js
static/protocol.js
+2
-2
No files found.
rtpconn/webclient.go
View file @
820b303e
...
@@ -464,7 +464,7 @@ func negotiate(c *webClient, down *rtpDownConnection, renegotiate, restartIce bo
...
@@ -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[
...
@@ -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
,
})
})
}
}
...
...
static/galene.js
View file @
820b303e
...
@@ -2090,10 +2090,10 @@ async function relayTest() {
...
@@ -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
;
...
...
static/protocol.js
View file @
820b303e
...
@@ -595,7 +595,7 @@ ServerConnection.prototype.gotOffer = async function(id, labels, source, usernam
...
@@ -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) {
...
@@ -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
();
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment