diff --git a/server/settings/btsets.go b/server/settings/btsets.go index b2f50ad..ab1cf13 100644 --- a/server/settings/btsets.go +++ b/server/settings/btsets.go @@ -29,7 +29,6 @@ type BTSets struct { // BT Config AcceptPeerCon bool `default:"true"` - AnnTorrentsToDht bool `default:"true"` EnableIPv6 bool DisableTCP bool DisableUTP bool @@ -122,7 +121,6 @@ func loadBTSets() { func SetDefault() { sets := new(BTSets) sets.AcceptPeerCon = true - sets.AnnTorrentsToDht = true sets.EnableDebug = false sets.DisableUTP = true sets.CacheSize = 96 * 1024 * 1024 // 96 MB diff --git a/server/torr/btserver.go b/server/torr/btserver.go index 7aedc97..6fd27ce 100644 --- a/server/torr/btserver.go +++ b/server/torr/btserver.go @@ -64,7 +64,6 @@ func (bt *BTServer) configure() { cliVers := userAgent //"uTorrent/2210(25302)" bt.config.AcceptPeerConnections = settings.BTsets.AcceptPeerCon - bt.config.PeriodicallyAnnounceTorrentsToDht = settings.BTsets.AnnTorrentsToDht bt.config.Debug = settings.BTsets.EnableDebug bt.config.DisableIPv6 = settings.BTsets.EnableIPv6 == false bt.config.DisableTCP = settings.BTsets.DisableTCP @@ -95,9 +94,9 @@ func (bt *BTServer) configure() { if settings.BTsets.PeersListenPort > 0 { bt.config.ListenPort = settings.BTsets.PeersListenPort } else { - log.Println("Find upnp port") upnpport := 32000 for { + log.Println("Check upnp port", upnpport) l, err := net.Listen("tcp", ":"+strconv.Itoa(upnpport)) if l != nil { l.Close() diff --git a/web/src/components/Settings/SecondarySettingsComponent.jsx b/web/src/components/Settings/SecondarySettingsComponent.jsx index 6ced79f..b4cf6ad 100644 --- a/web/src/components/Settings/SecondarySettingsComponent.jsx +++ b/web/src/components/Settings/SecondarySettingsComponent.jsx @@ -9,7 +9,6 @@ export default function SecondarySettingsComponent({ settings, inputForm }) { const { AcceptPeerCon, - AnnTorrentsToDht, RetrackersMode, TorrentDisconnectTimeout, EnableIPv6, @@ -86,11 +85,6 @@ export default function SecondarySettingsComponent({ settings, inputForm }) { label={t('SettingsDialog.DHT')} labelPlacement='start' /> - } - label={t('SettingsDialog.AnnTorrentsToDht')} - labelPlacement='start' - /> } label={t('SettingsDialog.AcceptPeerCon')} diff --git a/web/src/components/Settings/defaultSettings.js b/web/src/components/Settings/defaultSettings.js index a01b26e..88f4e55 100644 --- a/web/src/components/Settings/defaultSettings.js +++ b/web/src/components/Settings/defaultSettings.js @@ -1,6 +1,5 @@ export default { AcceptPeerCon: true, - AnnTorrentsToDht: true, CacheSize: 96, ReaderReadAHead: 95, UseDisk: false,