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

clarify error

Browse Source
This commit is contained in:
aler9
2022-11-09 12:49:45 +01:00
parent 76460d6404
commit 9029c3a9a3
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/liberrors/server.go
View File

@@ -242,7 +242,7 @@ type ErrServerUDPPortsAlreadyInUse struct {
// Error implements the error interface. // Error implements the error interface.
func (e ErrServerUDPPortsAlreadyInUse) Error() string { func (e ErrServerUDPPortsAlreadyInUse) Error() string {
return fmt.Sprintf("UDP ports %d and %d are already assigned to another reader", return fmt.Sprintf("UDP ports %d and %d are already assigned to another reader with the same IP",
e.Port, e.Port+1) e.Port, e.Port+1)
} }

5
server_read_test.go
View File

@@ -280,7 +280,7 @@ func TestServerReadSetupErrors(t *testing.T) {
} }
} }
func TestServerReadSetupErrorSameUDPPorts(t *testing.T) { func TestServerReadSetupErrorSameUDPPortsAndIP(t *testing.T) {
track := &TrackH264{ track := &TrackH264{
PayloadType: 96, PayloadType: 96,
SPS: []byte{0x01, 0x02, 0x03, 0x04}, SPS: []byte{0x01, 0x02, 0x03, 0x04},
@@ -295,7 +295,8 @@ func TestServerReadSetupErrorSameUDPPorts(t *testing.T) {
Handler: &testServerHandler{ Handler: &testServerHandler{
onConnClose: func(ctx *ServerHandlerOnConnCloseCtx) { onConnClose: func(ctx *ServerHandlerOnConnCloseCtx) {
if atomic.SwapInt32(&first, 0) == 1 { if atomic.SwapInt32(&first, 0) == 1 {
require.EqualError(t, ctx.Error, "UDP ports 35466 and 35467 are already assigned to another reader") require.EqualError(t, ctx.Error,
"UDP ports 35466 and 35467 are already assigned to another reader with the same IP")
} }
}, },
onSetup: func(ctx *ServerHandlerOnSetupCtx) (*base.Response, *ServerStream, error) { onSetup: func(ctx *ServerHandlerOnSetupCtx) (*base.Response, *ServerStream, error) {

2
serverstream.go
View File

@@ -145,7 +145,7 @@ func (st *ServerStream) readerAdd(
switch transport { switch transport {
case TransportUDP: case TransportUDP:
// check whether UDP ports are already assigned to another reader // check whether UDP ports and IP are already assigned to another reader
for r := range st.readers { for r := range st.readers {
if *r.setuppedTransport == TransportUDP && if *r.setuppedTransport == TransportUDP &&
r.author.ip().Equal(ss.author.ip()) && r.author.ip().Equal(ss.author.ip()) &&