package/gortsplib
1
0
Fork 0
mirror of https://github.com/aler9/gortsplib synced 2025-10-05 15:16:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

server: return specific error message in case interleaved IDs are in use

Browse Source
This commit is contained in:
aler9
2021-08-25 09:47:12 +02:00
parent e11fb9d5a0
commit 0840425ed2
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/liberrors/server.go
View File

@@ -175,6 +175,14 @@ func (e ErrServerTransportHeaderInvalidInterleavedIDs) Error() string {
return "invalid interleaved IDs" return "invalid interleaved IDs"
} }
// ErrServerTransportHeaderInterleavedIDsAlreadyUsed is an error that can be returned by a server.
type ErrServerTransportHeaderInterleavedIDsAlreadyUsed struct{}
// Error implements the error interface.
func (e ErrServerTransportHeaderInterleavedIDsAlreadyUsed) Error() string {
return "interleaved IDs already used"
}
// ErrServerTracksDifferentProtocols is an error that can be returned by a server. // ErrServerTracksDifferentProtocols is an error that can be returned by a server.
type ErrServerTracksDifferentProtocols struct{} type ErrServerTracksDifferentProtocols struct{}

6
serversession.go
View File

@@ -605,8 +605,8 @@ func (ss *ServerSession) handleRequest(sc *ServerConn, req *base.Request) (*base
}, liberrors.ErrServerTransportHeaderNoInterleavedIDs{} }, liberrors.ErrServerTransportHeaderNoInterleavedIDs{}
} }
if (inTH.InterleavedIDs[0]+1) != inTH.InterleavedIDs[1] || if (inTH.InterleavedIDs[0]%2) != 0 ||
(inTH.InterleavedIDs[0]%2) != 0 { (inTH.InterleavedIDs[0]+1) != inTH.InterleavedIDs[1] {
return &base.Response{ return &base.Response{
StatusCode: base.StatusBadRequest, StatusCode: base.StatusBadRequest,
}, liberrors.ErrServerTransportHeaderInvalidInterleavedIDs{} }, liberrors.ErrServerTransportHeaderInvalidInterleavedIDs{}
@@ -615,7 +615,7 @@ func (ss *ServerSession) handleRequest(sc *ServerConn, req *base.Request) (*base
if _, ok := ss.setuppedTracksByChannel[inTH.InterleavedIDs[0]]; ok { if _, ok := ss.setuppedTracksByChannel[inTH.InterleavedIDs[0]]; ok {
return &base.Response{ return &base.Response{
StatusCode: base.StatusBadRequest, StatusCode: base.StatusBadRequest,
}, liberrors.ErrServerTransportHeaderInvalidInterleavedIDs{} }, liberrors.ErrServerTransportHeaderInterleavedIDsAlreadyUsed{}
} }
} }