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

only check IPv6 if enabled

Browse Source
This commit is contained in:
nikk gitanes
2022-05-26 10:59:07 +03:00
parent e0c41ff6be
commit 565150aede
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
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() blocklist, _ := utils.ReadBlockedIP()
bt.config = torrent.NewDefaultClientConfig() bt.config = torrent.NewDefaultClientConfig()
@@ -146,6 +146,8 @@ func (bt *BTServer) configure(ctx context.Context) (err error) {
log.Println("Client config:", settings.BTsets) log.Println("Client config:", settings.BTsets)
var err error
// set public IPv4 // set public IPv4
if settings.PubIPv4 != "" { if settings.PubIPv4 != "" {
if ip4 := net.ParseIP(settings.PubIPv4); ip4.To4() != nil && !isPrivateIP(ip4) { if ip4 := net.ParseIP(settings.PubIPv4); ip4.To4() != nil && !isPrivateIP(ip4) {
@@ -168,7 +170,7 @@ func (bt *BTServer) configure(ctx context.Context) (err error) {
bt.config.PublicIp6 = ip6 bt.config.PublicIp6 = ip6
} }
} }
if bt.config.PublicIp6 == nil { if bt.config.PublicIp6 == nil && settings.BTsets.EnableIPv6 {
bt.config.PublicIp6, err = publicip.Get6(ctx) bt.config.PublicIp6, err = publicip.Get6(ctx)
if err != nil { if err != nil {
log.Printf("error getting public ipv6 address: %v", err) log.Printf("error getting public ipv6 address: %v", err)
@@ -177,7 +179,6 @@ func (bt *BTServer) configure(ctx context.Context) (err error) {
if bt.config.PublicIp6 != nil { if bt.config.PublicIp6 != nil {
log.Println("PublicIp6:", bt.config.PublicIp6) log.Println("PublicIp6:", bt.config.PublicIp6)
} }
return err
} }
func (bt *BTServer) GetTorrent(hash torrent.InfoHash) *Torrent { func (bt *BTServer) GetTorrent(hash torrent.InfoHash) *Torrent {