fix api docs and cosmetics

This commit is contained in:
nikk gitanes
2024-02-03 01:12:40 +03:00
parent cd830f67c9
commit 9d03b777f5
7 changed files with 41 additions and 54 deletions

View File

@@ -88,14 +88,13 @@ func (bt *BTServer) configure(ctx context.Context) {
upnpID := "TorrServer/" + version.Version
cliVers := userAgent
// bt.config.AlwaysWantConns = true
bt.config.Debug = settings.BTsets.EnableDebug
bt.config.DisableIPv6 = !settings.BTsets.EnableIPv6
bt.config.DisableTCP = settings.BTsets.DisableTCP
bt.config.DisableUTP = settings.BTsets.DisableUTP
// https://github.com/anacrolix/torrent/issues/703
// bt.config.DisableWebtorrent = true // TODO: check memory usage
// bt.config.DisableWebseeds = false
// bt.config.DisableWebtorrent = true // NE
// bt.config.DisableWebseeds = false // NE
bt.config.NoDefaultPortForwarding = settings.BTsets.DisableUPNP
bt.config.NoDHT = settings.BTsets.DisableDHT
bt.config.DisablePEX = settings.BTsets.DisablePEX
@@ -109,13 +108,13 @@ func (bt *BTServer) configure(ctx context.Context) {
bt.config.EstablishedConnsPerTorrent = settings.BTsets.ConnectionsLimit
bt.config.TotalHalfOpenConns = 500
// Encryption/Obfuscation
bt.config.EncryptionPolicy = torrent.EncryptionPolicy{
ForceEncryption: settings.BTsets.ForceEncrypt,
}
// bt.config.HeaderObfuscationPolicy = torrent.HeaderObfuscationPolicy{
// RequirePreferred: settings.BTsets.ForceEncrypt,
// Preferred: true,
// }
bt.config.EncryptionPolicy = torrent.EncryptionPolicy{ // OE
ForceEncryption: settings.BTsets.ForceEncrypt, // OE
} // OE
// bt.config.HeaderObfuscationPolicy = torrent.HeaderObfuscationPolicy{ // NE
// RequirePreferred: settings.BTsets.ForceEncrypt, // NE
// Preferred: true, // NE
// } // NE
if settings.BTsets.DownloadRateLimit > 0 {
bt.config.DownloadRateLimiter = utils.Limit(settings.BTsets.DownloadRateLimit * 1024)
}
@@ -130,21 +129,8 @@ func (bt *BTServer) configure(ctx context.Context) {
log.Println("Set listen port", settings.BTsets.PeersListenPort)
bt.config.ListenPort = settings.BTsets.PeersListenPort
} else {
// lport := 32000
// for {
// log.Println("Check listen port", lport)
// l, err := net.Listen("tcp", ":"+strconv.Itoa(lport))
// if l != nil {
// l.Close()
// }
// if err == nil {
// break
// }
// lport++
// }
// log.Println("Set listen port", lport)
log.Println("Set listen port to random autoselect (0)")
bt.config.ListenPort = 0 // lport
bt.config.ListenPort = 0
}
}

View File

@@ -25,20 +25,20 @@ func NewStorage(capacity int64) *Storage {
}
func (s *Storage) OpenTorrent(info *metainfo.Info, infoHash metainfo.Hash) (ts.TorrentImpl, error) {
// capFunc := func() (int64, bool) {
// return s.capacity, true
// }
// capFunc := func() (int64, bool) { // NE
// return s.capacity, true // NE
// } // NE
s.mu.Lock()
defer s.mu.Unlock()
ch := NewCache(s.capacity, s)
ch.Init(info, infoHash)
s.caches[infoHash] = ch
return ch, nil
// return ts.TorrentImpl{
// Piece: ch.Piece,
// Close: ch.Close,
// Capacity: &capFunc,
// }, nil
return ch, nil // OE
// return ts.TorrentImpl{ // NE
// Piece: ch.Piece, // NE
// Close: ch.Close, // NE
// Capacity: &capFunc, // NE
// }, nil // NE
}
func (s *Storage) CloseHash(hash metainfo.Hash) {