sovonegr/TorrServerJellyfin
1
0
Fork 0
mirror of https://github.com/Ernous/TorrServerJellyfin.git synced 2025-12-19 21:46:11 +05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into old-engine

Browse Source
This commit is contained in:
nikk gitanes
2022-05-27 10:06:36 +03:00
parent 1a653a1048 d38a63a4af
commit d44687a270
12 changed files with 31 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
server/torr/btserver.go
View File

@@ -77,7 +77,7 @@ func (bt *BTServer) Disconnect() {
}
}
func (bt *BTServer) configure(ctx context.Context) (err error) {
func (bt *BTServer) configure(ctx context.Context) {
blocklist, _ := utils.ReadBlockedIP()
bt.config = torrent.NewDefaultClientConfig()
@@ -124,31 +124,34 @@ func (bt *BTServer) configure(ctx context.Context) (err error) {
bt.config.UploadRateLimiter = utils.Limit(settings.BTsets.UploadRateLimit * 1024)
}
if settings.TorAddr != "" {
log.Println("Set listen addr", settings.TorAddr)
bt.config.SetListenAddr(settings.TorAddr)
} else {
if settings.BTsets.PeersListenPort > 0 {
log.Println("Set listen port", settings.BTsets.PeersListenPort)
bt.config.ListenPort = settings.BTsets.PeersListenPort
} else {
upnpport := 32000
lport := 32000
for {
log.Println("Check upnp port", upnpport)
l, err := net.Listen("tcp", ":"+strconv.Itoa(upnpport))
log.Println("Check listen port", lport)
l, err := net.Listen("tcp", ":"+strconv.Itoa(lport))
if l != nil {
l.Close()
}
if err == nil {
break
}
upnpport++
lport++
}
log.Println("Set upnp port", upnpport)
bt.config.ListenPort = upnpport
log.Println("Set listen port", lport)
bt.config.ListenPort = lport
}
}
log.Println("Client config:", settings.BTsets)
var err error
// set public IPv4
if settings.PubIPv4 != "" {
if ip4 := net.ParseIP(settings.PubIPv4); ip4.To4() != nil && !isPrivateIP(ip4) {
@@ -171,7 +174,7 @@ func (bt *BTServer) configure(ctx context.Context) (err error) {
bt.config.PublicIp6 = ip6
}
}
if bt.config.PublicIp6 == nil {
if bt.config.PublicIp6 == nil && settings.BTsets.EnableIPv6 {
bt.config.PublicIp6, err = publicip.Get6(ctx)
if err != nil {
log.Printf("error getting public ipv6 address: %v", err)
@@ -180,7 +183,6 @@ func (bt *BTServer) configure(ctx context.Context) (err error) {
if bt.config.PublicIp6 != nil {
log.Println("PublicIp6:", bt.config.PublicIp6)
}
return err
}
func (bt *BTServer) GetTorrent(hash torrent.InfoHash) *Torrent {