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
e81ee4af
Commit
e81ee4af
authored
Sep 16, 2021
by
Juliusz Chroboczek
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove userId and userName from rtpconn.
They're redundant with the client field.
parent
c860fb96
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
8 deletions
+7
-8
rtpconn/rtpconn.go
rtpconn/rtpconn.go
+1
-3
rtpconn/webclient.go
rtpconn/webclient.go
+6
-5
No files found.
rtpconn/rtpconn.go
View file @
e81ee4af
...
...
@@ -508,8 +508,6 @@ type rtpUpConnection struct {
id
string
client
group
.
Client
label
string
userId
string
username
string
pc
*
webrtc
.
PeerConnection
iceCandidates
[]
*
webrtc
.
ICECandidateInit
...
...
@@ -548,7 +546,7 @@ func (up *rtpUpConnection) Label() string {
}
func
(
up
*
rtpUpConnection
)
User
()
(
string
,
string
)
{
return
up
.
userId
,
up
.
username
return
up
.
client
.
Id
(),
up
.
client
.
Username
()
}
func
(
up
*
rtpUpConnection
)
AddLocal
(
local
conn
.
Down
)
error
{
...
...
rtpconn/webclient.go
View file @
e81ee4af
...
...
@@ -211,10 +211,13 @@ func delUpConn(c *webClient, id string, userId string, push bool) error {
c
.
mu
.
Unlock
()
return
os
.
ErrNotExist
}
if
userId
!=
""
&&
conn
.
userId
!=
userId
{
if
userId
!=
""
{
id
,
_
:=
conn
.
User
()
if
id
!=
userId
{
c
.
mu
.
Unlock
()
return
ErrUserMismatch
}
}
replace
:=
conn
.
getReplace
(
false
)
...
...
@@ -576,8 +579,6 @@ func gotOffer(c *webClient, id, label string, sdp string, replace string) error
return
err
}
up
.
userId
=
c
.
Id
()
up
.
username
=
c
.
Username
()
if
replace
!=
""
{
up
.
replace
=
replace
delUpConn
(
c
,
replace
,
c
.
Id
(),
false
)
...
...
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