diff --git a/server/settings/btsets.go b/server/settings/btsets.go index 331dadb..5d6c65c 100644 --- a/server/settings/btsets.go +++ b/server/settings/btsets.go @@ -12,7 +12,7 @@ import ( type BTSets struct { // Cache - CacheSize int64 // in byte, def 200 mb + CacheSize int64 // in byte, def 96 MB ReaderReadAHead int // in percent, 5%-100%, [...S__X__E...] [S-E] not clean PreloadCache int // in percent @@ -28,6 +28,7 @@ type BTSets struct { EnableDebug bool // print logs // BT Config + AcceptPeerCon bool EnableIPv6 bool DisableTCP bool DisableUTP bool @@ -38,9 +39,9 @@ type BTSets struct { DownloadRateLimit int // in kb, 0 - inf UploadRateLimit int // in kb, 0 - inf ConnectionsLimit int - DhtConnectionLimit int // 0 - inf + //DhtConnectionLimit int // 0 - inf PeersListenPort int - Strategy int // 0 - RequestStrategyDuplicateRequestTimeout, 1 - RequestStrategyFuzzing, 2 - RequestStrategyFastest + //Strategy int // 0 - RequestStrategyDuplicateRequestTimeout, 1 - RequestStrategyFuzzing, 2 - RequestStrategyFastest } func (v *BTSets) String() string { @@ -119,12 +120,13 @@ func loadBTSets() { func SetDefault() { sets := new(BTSets) + sets.AcceptPeerCon = true sets.EnableDebug = false sets.DisableUTP = true - sets.CacheSize = 96 * 1024 * 1024 // 100mb + sets.CacheSize = 96 * 1024 * 1024 // 96 MB sets.PreloadCache = 0 sets.ConnectionsLimit = 23 - sets.DhtConnectionLimit = 500 + //sets.DhtConnectionLimit = 500 sets.RetrackersMode = 1 sets.TorrentDisconnectTimeout = 30 sets.ReaderReadAHead = 95 // 95% preload diff --git a/server/torr/btserver.go b/server/torr/btserver.go index c5e2c33..9b3b4e7 100644 --- a/server/torr/btserver.go +++ b/server/torr/btserver.go @@ -63,6 +63,7 @@ func (bt *BTServer) configure() { peerID := "-qB4320-" cliVers := userAgent //"uTorrent/2210(25302)" + bt.config.AcceptPeerConnections = settings.BTsets.AcceptPeerCon bt.config.Debug = settings.BTsets.EnableDebug bt.config.DisableIPv6 = settings.BTsets.EnableIPv6 == false bt.config.DisableTCP = settings.BTsets.DisableTCP @@ -84,10 +85,6 @@ func (bt *BTServer) configure() { Preferred: true, } -// TODO -// if settings.BTsets.DhtConnectionLimit > 0 { -// bt.config.ConnTracker.SetMaxEntries(settings.BTsets.DhtConnectionLimit) -// } if settings.BTsets.DownloadRateLimit > 0 { bt.config.DownloadRateLimiter = utils.Limit(settings.BTsets.DownloadRateLimit * 1024) } diff --git a/web/src/components/Settings/SecondarySettingsComponent.jsx b/web/src/components/Settings/SecondarySettingsComponent.jsx index edad543..b4cf6ad 100644 --- a/web/src/components/Settings/SecondarySettingsComponent.jsx +++ b/web/src/components/Settings/SecondarySettingsComponent.jsx @@ -8,6 +8,7 @@ export default function SecondarySettingsComponent({ settings, inputForm }) { const { t } = useTranslation() const { + AcceptPeerCon, RetrackersMode, TorrentDisconnectTimeout, EnableIPv6, @@ -21,7 +22,6 @@ export default function SecondarySettingsComponent({ settings, inputForm }) { DownloadRateLimit, UploadRateLimit, ConnectionsLimit, - DhtConnectionLimit, PeersListenPort, } = settings || {} @@ -85,15 +85,10 @@ export default function SecondarySettingsComponent({ settings, inputForm }) { label={t('SettingsDialog.DHT')} labelPlacement='start' /> - } + label={t('SettingsDialog.AcceptPeerCon')} + labelPlacement='start' />