package/gortsplib
1
0
Fork 0
mirror of https://github.com/aler9/gortsplib synced 2025-10-04 06:46:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

server: rename session id into secretID

Browse Source
This commit is contained in:
aler9
2021-08-04 17:21:25 +02:00
parent 15425ca26e
commit 2914af3fda
3 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
server.go
View File

@@ -29,7 +29,7 @@ func extractPort(address string) (int, error) {
return int(tmp2), nil
}
func newSessionID(sessions map[string]*ServerSession) (string, error) {
func newSessionSecretID(sessions map[string]*ServerSession) (string, error) {
for {
b := make([]byte, 4)
_, err := rand.Read(b)
@@ -372,7 +372,7 @@ outer:
continue
}
id, err := newSessionID(s.sessions)
secretID, err := newSessionSecretID(s.sessions)
if err != nil {
req.res <- sessionRequestRes{
res: &base.Response{
@@ -383,8 +383,8 @@ outer:
continue
}
ss := newServerSession(s, id, req.sc)
s.sessions[id] = ss
ss := newServerSession(s, secretID, req.sc)
s.sessions[secretID] = ss
select {
case ss.request <- req:
@@ -399,10 +399,10 @@ outer:
}
case ss := <-s.sessionClose:
if sss, ok := s.sessions[ss.id]; !ok || sss != ss {
if sss, ok := s.sessions[ss.secretID]; !ok || sss != ss {
continue
}
delete(s.sessions, ss.id)
delete(s.sessions, ss.secretID)
ss.Close()
case st := <-s.streamAdd: