From 7fc547c3049199908bae6a1bc2404853a9bab6ba Mon Sep 17 00:00:00 2001 From: Ingo Oppermann Date: Thu, 15 Jun 2023 14:22:07 +0200 Subject: [PATCH] Fix assembling SRT streamid, log output --- srt/srt.go | 4 ++-- srt/url/url.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/srt/srt.go b/srt/srt.go index b304b630..ad19b42f 100644 --- a/srt/srt.go +++ b/srt/srt.go @@ -322,7 +322,7 @@ func (s *server) handleConnect(req srt.ConnRequest) srt.ConnType { identity, err := s.findIdentityFromToken(si.Token) if err != nil { s.logger.Debug().WithError(err).Log("invalid token") - s.log("PUBLISH", "FORBIDDEN", si.Resource, "invalid token", client) + s.log("CONNECT", "FORBIDDEN", si.Resource, "invalid token", client) return srt.REJECT } @@ -334,7 +334,7 @@ func (s *server) handleConnect(req srt.ConnRequest) srt.ConnType { } if !s.iam.Enforce(identity, domain, resource, action) { - s.log("PUBLISH", "FORBIDDEN", si.Resource, "access denied", client) + s.log("CONNECT", "FORBIDDEN", si.Resource, "access denied", client) return srt.REJECT } diff --git a/srt/url/url.go b/srt/url/url.go index 0ec890b1..3fa49cb7 100644 --- a/srt/url/url.go +++ b/srt/url/url.go @@ -89,7 +89,7 @@ type StreamInfo struct { func (si *StreamInfo) String() string { streamid := si.Resource - if si.Mode != "request" { + if len(si.Mode) != 0 && si.Mode != "request" { streamid += ",mode:" + si.Mode }