mirror of
https://github.com/aler9/gortsplib
synced 2025-10-08 00:20:05 +08:00
change and check error message
This commit is contained in:
@@ -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 in use by another reader",
|
return fmt.Sprintf("UDP ports %d and %d are already assigned to another reader",
|
||||||
e.Port, e.Port+1)
|
e.Port, e.Port+1)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -289,9 +289,15 @@ func TestServerReadSetupErrorSameUDPPorts(t *testing.T) {
|
|||||||
|
|
||||||
stream := NewServerStream(Tracks{track})
|
stream := NewServerStream(Tracks{track})
|
||||||
defer stream.Close()
|
defer stream.Close()
|
||||||
|
first := int32(1)
|
||||||
|
|
||||||
s := &Server{
|
s := &Server{
|
||||||
Handler: &testServerHandler{
|
Handler: &testServerHandler{
|
||||||
|
onConnClose: func(ctx *ServerHandlerOnConnCloseCtx) {
|
||||||
|
if atomic.SwapInt32(&first, 0) == 1 {
|
||||||
|
require.EqualError(t, ctx.Error, "UDP ports 35466 and 35467 are already assigned to another reader")
|
||||||
|
}
|
||||||
|
},
|
||||||
onSetup: func(ctx *ServerHandlerOnSetupCtx) (*base.Response, *ServerStream, error) {
|
onSetup: func(ctx *ServerHandlerOnSetupCtx) (*base.Response, *ServerStream, error) {
|
||||||
return &base.Response{
|
return &base.Response{
|
||||||
StatusCode: base.StatusOK,
|
StatusCode: base.StatusOK,
|
||||||
|
@@ -123,7 +123,7 @@ func (st *ServerStream) readerAdd(
|
|||||||
return fmt.Errorf("stream is closed")
|
return fmt.Errorf("stream is closed")
|
||||||
}
|
}
|
||||||
|
|
||||||
// check whether UDP ports are already in use by another reader
|
// check whether UDP ports are already assigned to another reader
|
||||||
if transport == TransportUDP {
|
if transport == TransportUDP {
|
||||||
for r := range st.readers {
|
for r := range st.readers {
|
||||||
if *r.setuppedTransport == TransportUDP &&
|
if *r.setuppedTransport == TransportUDP &&
|
||||||
|
Reference in New Issue
Block a user