From 744dec82578c61e38d3525b7e7b8aeb2c3ef670c Mon Sep 17 00:00:00 2001 From: Alessandro Ros Date: Mon, 8 May 2023 16:44:22 +0200 Subject: [PATCH] server: remove dashes from session ID (#278) --- server.go | 7 ++----- server_session.go | 5 ++++- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/server.go b/server.go index dcdb142d..0dd14516 100644 --- a/server.go +++ b/server.go @@ -9,8 +9,6 @@ import ( "sync" "time" - "github.com/google/uuid" - "github.com/bluenviron/gortsplib/v3/pkg/base" "github.com/bluenviron/gortsplib/v3/pkg/liberrors" ) @@ -410,9 +408,8 @@ func (s *Server) run() { continue } - secretID := uuid.New().String() - ss := newServerSession(s, secretID, req.sc) - s.sessions[secretID] = ss + ss := newServerSession(s, req.sc) + s.sessions[ss.secretID] = ss select { case ss.request <- req: diff --git a/server_session.go b/server_session.go index a17a1ca4..afd7cbde 100644 --- a/server_session.go +++ b/server_session.go @@ -9,6 +9,7 @@ import ( "sync/atomic" "time" + "github.com/google/uuid" "github.com/pion/rtcp" "github.com/pion/rtp" @@ -198,11 +199,13 @@ type ServerSession struct { func newServerSession( s *Server, - secretID string, author *ServerConn, ) *ServerSession { ctx, ctxCancel := context.WithCancel(s.ctx) + // use an UUID without dashes, since dashes confuse some clients. + secretID := strings.ReplaceAll(uuid.New().String(), "-", "") + ss := &ServerSession{ s: s, secretID: secretID,