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

Revert "fix build, rework interface check and filter ipv6 for name"

Browse Source 
This reverts commit ce31a383db.
This commit is contained in:
nikk gitanes
2021-09-13 19:25:27 +03:00
parent a5f60a530f
commit 8cd867c92c
2 changed files with 16 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
server/dlna/dlna.go
View File

@@ -7,7 +7,6 @@ import (
"os" "os"
"os/user" "os/user"
"path/filepath" "path/filepath"
"runtime"
"time" "time"
"github.com/anacrolix/dms/dlna/dms" "github.com/anacrolix/dms/dlna/dms"
@@ -28,12 +27,10 @@ func Start() {
log.TLogln(err) log.TLogln(err)
os.Exit(1) os.Exit(1)
} }
for _, i := range ifaces { for _, element := range ifaces {
// interface flags seem to always be 0 on Windows if element.Flags&net.FlagLoopback == 0 && element.Flags&net.FlagUp == net.FlagUp && element.Flags&net.FlagMulticast == net.FlagMulticast && utils.IsPhysicalInterface(element.HardwareAddr.String()) {
if runtime.GOOS != "windows" && (i.Flags&net.FlagLoopback != 0 || i.Flags&net.FlagUp == 0 || i.Flags&net.FlagMulticast == 0) || !utils.IsPhysicalInterface(i.HardwareAddr.String()) { ifs = append(ifs, element)
continue
} }
ifs = append(ifs, i)
} }
return return
}(), }(),
@@ -167,11 +164,8 @@ func getDefaultFriendlyName() string {
} }
var list []string var list []string
for _, i := range ifaces { for _, i := range ifaces {
// interface flags seem to always be 0 on Windows
if runtime.GOOS != "windows" && (i.Flags&net.FlagLoopback != 0 || i.Flags&net.FlagUp == 0 || i.Flags&net.FlagMulticast == 0) || !utils.IsPhysicalInterface(i.HardwareAddr.String()) {
continue
}
addrs, _ := i.Addrs() addrs, _ := i.Addrs()
if i.Flags&net.FlagLoopback == 0 && i.Flags&net.FlagUp == net.FlagUp && i.Flags&net.FlagMulticast == net.FlagMulticast && utils.IsPhysicalInterface(i.HardwareAddr.String()) {
for _, addr := range addrs { for _, addr := range addrs {
var ip net.IP var ip net.IP
switch v := addr.(type) { switch v := addr.(type) {
@@ -180,11 +174,12 @@ func getDefaultFriendlyName() string {
case *net.IPAddr: case *net.IPAddr:
ip = v.IP ip = v.IP
} }
if !ip.IsLoopback() && ip.To4() != nil { if !ip.IsLoopback() {
list = append(list, ip.String()) list = append(list, ip.String())
} }
} }
} }
}
if len(list) > 0 { if len(list) > 0 {
return ret + " " + list[0] return ret + " " + list[0]
} }

2
server/utils/net_interface_filter_nix_darwin.go
View File

@@ -20,7 +20,7 @@ func GetAllPhysicalInterfaces() []PhysicalInterface {
var outInterfaces []PhysicalInterface var outInterfaces []PhysicalInterface
for _, element := range ifaces { for _, element := range ifaces {
if element.Flags&net.FlagLoopback == 0 && element.Flags&net.FlagUp == 1 && IsPhysicalInterface(element.HardwareAddr.String()) { if element.Flags&net.FlagLoopback == 0 && element.Flags&net.FlagUp == 1 && isPhysicalInterface(element.HardwareAddr.String()) {
outInterfaces = append(outInterfaces, PhysicalInterface{MACAddress: element.HardwareAddr.String(), Name: element.Name, FriendlyName: element.Name}) outInterfaces = append(outInterfaces, PhysicalInterface{MACAddress: element.HardwareAddr.String(), Name: element.Name, FriendlyName: element.Name})
} }
} }