add AcceptPeerCon and sync server options

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

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)
 	}

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'
       />
-      <TextField
-        onChange={inputForm}
-        margin='normal'
-        id='DhtConnectionLimit'
-        label={t('SettingsDialog.DhtConnectionLimit')}
-        value={DhtConnectionLimit}
-        type='number'
-        variant='outlined'
-        fullWidth
+      <FormControlLabel
+        control={<Switch checked={AcceptPeerCon} onChange={inputForm} id='AcceptPeerCon' color='secondary' />}
+        label={t('SettingsDialog.AcceptPeerCon')}
+        labelPlacement='start'
       />
       <br />
       <TextField

web/src/components/Settings/defaultSettings.js

@@ -1,11 +1,11 @@
 export default {
+  AcceptPeerCon: true,
   CacheSize: 96,
   ReaderReadAHead: 95,
   UseDisk: false,
   UploadRateLimit: 0,
   TorrentsSavePath: '',
   ConnectionsLimit: 23,
-  DhtConnectionLimit: 500,
   DisableDHT: false,
   DisablePEX: false,
   DisableTCP: false,
@@ -20,6 +20,5 @@ export default {
   PreloadCache: 0,
   RemoveCacheOnDrop: false,
   RetrackersMode: 1,
-  Strategy: 0,
   TorrentDisconnectTimeout: 30,
 }

web/src/locales/en/translation.json

@@ -84,6 +84,7 @@
   "Seconds": "Seconds",
   "SelectSeason": "Select Season",
   "SettingsDialog": {
+    "AcceptPeerCon": "Accept Peer Connections",
     "AddRetrackers": "Add retrackers",
     "AdditionalSettings": "Additional Settings",
     "CacheBeforeReaderDesc": "from cache will be saved before currently played frame",

web/src/locales/ru/translation.json

@@ -84,6 +84,7 @@
   "Seconds": "Секунды",
   "SelectSeason": "Выбор сезона",
   "SettingsDialog": {
+    "AcceptPeerCon": "Принимать входящие соединения",
     "AddRetrackers": "Добавлять",
     "AdditionalSettings": "Дополнительные настройки",
     "CacheBeforeReaderDesc": "от кеша будет оставаться позади воспроизводимого кадра",