mirror of
https://github.com/aler9/gortsplib
synced 2025-10-04 23:02:45 +08:00
replace ListenTCP with Listen
This commit is contained in:
@@ -8,7 +8,7 @@ import (
|
|||||||
// Server is a RTSP server.
|
// Server is a RTSP server.
|
||||||
type Server struct {
|
type Server struct {
|
||||||
conf ServerConf
|
conf ServerConf
|
||||||
listener *net.TCPListener
|
listener net.Listener
|
||||||
}
|
}
|
||||||
|
|
||||||
// Close closes the server.
|
// Close closes the server.
|
||||||
|
@@ -31,8 +31,8 @@ type ServerConf struct {
|
|||||||
ReadBufferCount int
|
ReadBufferCount int
|
||||||
|
|
||||||
// function used to initialize the TCP listener.
|
// function used to initialize the TCP listener.
|
||||||
// It defaults to net.ListenTCP.
|
// It defaults to net.Listen
|
||||||
ListenTCP func(network string, address *net.TCPAddr) (*net.TCPListener, error)
|
Listen func(network string, address string) (net.Listener, error)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Serve starts a server on the given address.
|
// Serve starts a server on the given address.
|
||||||
@@ -46,16 +46,11 @@ func (c ServerConf) Serve(address string) (*Server, error) {
|
|||||||
if c.ReadBufferCount == 0 {
|
if c.ReadBufferCount == 0 {
|
||||||
c.ReadBufferCount = 1
|
c.ReadBufferCount = 1
|
||||||
}
|
}
|
||||||
if c.ListenTCP == nil {
|
if c.Listen == nil {
|
||||||
c.ListenTCP = net.ListenTCP
|
c.Listen = net.Listen
|
||||||
}
|
}
|
||||||
|
|
||||||
addr, err := net.ResolveTCPAddr("tcp", address)
|
listener, err := c.Listen("tcp", address)
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
listener, err := c.ListenTCP("tcp", addr)
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
@@ -214,7 +214,7 @@ func TestServerPublishReadTCP(t *testing.T) {
|
|||||||
require.Equal(t, 0, cnt2.wait())
|
require.Equal(t, 0, cnt2.wait())
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestServerTeardown(t *testing.T) {
|
func TestServerTeardownResponse(t *testing.T) {
|
||||||
ts, err := newTestServ()
|
ts, err := newTestServ()
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
defer ts.close()
|
defer ts.close()
|
||||||
|
Reference in New Issue
Block a user