client.go | 2 +- client_test.go | 20 ++------------------ diff --git a/client.go b/client.go index 036154ab092e8606725a86b806ba7a02e187eee3..2c402198fcc1c65e3647bf5ef7ded546be43028f 100644 --- a/client.go +++ b/client.go @@ -230,7 +230,7 @@ cl.config.HTTPProxy = http.ProxyURL(fixedURL) } } - cl.conns, err = listenAll(cl.enabledPeerNetworks(), cl.config.ListenHost, cl.config.ListenPort, cl.config.ProxyURL, cl.firewallCallback) + cl.conns, err = listenAll(allPeerNetworks, cl.config.ListenHost, cl.config.ListenPort, cl.config.ProxyURL, cl.firewallCallback) if err != nil { return } diff --git a/client_test.go b/client_test.go index af3457da4e9b564147b91c7bec1970f66a01cf48..4b74a64babfb2120ffc7aa906fa68fb4ceb90d70 100644 --- a/client_test.go +++ b/client_test.go @@ -873,37 +873,21 @@ func TestClientDynamicListenTCPOnly(t *testing.T) { cfg := TestingConfig() cfg.DisableUTP = true + cfg.DisableTCP = false cl, err := NewClient(cfg) require.NoError(t, err) defer cl.Close() assert.NotEqual(t, 0, cl.LocalPort()) - cl.eachListener(func(s socket) bool { - assert.True(t, isTcpNetwork(s.Addr().Network())) - return true - }) } func TestClientDynamicListenUTPOnly(t *testing.T) { cfg := TestingConfig() cfg.DisableTCP = true + cfg.DisableUTP = false cl, err := NewClient(cfg) require.NoError(t, err) defer cl.Close() assert.NotEqual(t, 0, cl.LocalPort()) - cl.eachListener(func(s socket) bool { - assert.True(t, isUtpNetwork(s.Addr().Network())) - return true - }) -} - -func TestClientDynamicListenPortNoProtocols(t *testing.T) { - cfg := TestingConfig() - cfg.DisableTCP = true - cfg.DisableUTP = true - cl, err := NewClient(cfg) - require.NoError(t, err) - defer cl.Close() - assert.Equal(t, 0, cl.LocalPort()) } func totalConns(tts []*Torrent) (ret int) {