diff --git a/config.toml.example b/config.toml.example index c265194..3308afb 100644 --- a/config.toml.example +++ b/config.toml.example @@ -28,10 +28,6 @@ addresses = ["localhost:1337"] # for more info #lossMaxTTL = 0 -# SRT protocol `listen_timeout`, value set in milliseconds. Sets the socket listen timeout, or the -# maximum time to wait for a response from the client before dropping the connection -#listenTimeout = 3000 - # Experimental: synchronize MPEG-TS clients to a GOP start # This should not increase playback delay, just make sure the client always # starts with a clean packet stream. diff --git a/config/config.go b/config/config.go index 90c21ff..cb96e2d 100644 --- a/config/config.go +++ b/config/config.go @@ -23,7 +23,6 @@ type AppConfig struct { Addresses []string PublicAddress string Latency uint - ListenTimeout uint // total buffer size in bytes, determines maximum delay of a client Buffersize uint @@ -88,7 +87,6 @@ func Parse(paths []string) (*Config, error) { App: AppConfig{ Addresses: []string{"localhost:1337"}, Latency: 200, - ListenTimeout: 3000, LossMaxTTL: 0, Buffersize: 384000, // 1s @ 3Mbits/s SyncClients: false, diff --git a/config/config_test.go b/config/config_test.go index 85ed96a..bf2ce1e 100644 --- a/config/config_test.go +++ b/config/config_test.go @@ -19,7 +19,6 @@ func TestConfig(t *testing.T) { assert.Equal(t, conf.App.SyncClients, true) assert.Equal(t, conf.App.PacketSize, uint(1456)) assert.Equal(t, conf.App.LossMaxTTL, uint(50)) - assert.Equal(t, conf.App.ListenTimeout, uint(5555)) assert.Equal(t, conf.App.PublicAddress, "dontlookmeup:5432") assert.Equal(t, conf.App.ListenBacklog, 30) diff --git a/config/testfiles/config_test.toml b/config/testfiles/config_test.toml index a62b133..c472f6b 100644 --- a/config/testfiles/config_test.toml +++ b/config/testfiles/config_test.toml @@ -5,8 +5,8 @@ buffersize = 123000 syncClients = true packetSize = 1456 lossMaxTTL= 50 -listenTimeout= 5555 publicAddress = "dontlookmeup:5432" +listenBacklog = 30 [api] enabled = false diff --git a/srt/server.go b/srt/server.go index db50f30..322a3d9 100644 --- a/srt/server.go +++ b/srt/server.go @@ -32,7 +32,6 @@ type ServerConfig struct { Addresses []string PublicAddress string Latency uint - ListenTimeout uint LossMaxTTL uint Auth auth.Authenticator SyncClients bool @@ -136,7 +135,6 @@ func (s *ServerImpl) listenAt(ctx context.Context, host string, port uint16) err options := make(map[string]string) options["blocking"] = "0" options["transtype"] = "live" - options["listen_timeout"] = strconv.Itoa(int(s.config.ListenTimeout)) options["latency"] = strconv.Itoa(int(s.config.Latency)) sck := srtgo.NewSrtSocket(host, port, options)