Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2026-01-17 06:05:29 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

🎨 Improve the network serve address list https://github.com/siyuan-note/siyuan/issues/14943

Browse source 
Signed-off-by: Daniel <845765@qq.com>
This commit is contained in:
Daniel 2026-01-16 11:20:55 +08:00
parent 88e1f0312c
commit 8cbf2897bb
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
2 changed files with 59 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

58
kernel/util/net.go
View file

@ -33,6 +33,64 @@ import (
"github.com/siyuan-note/logging"
)
// GetPrivateIPv4s 获取本地所有的私有 IPv4 地址（排除虚拟网卡）
func GetPrivateIPv4s() (ret []string) {
ret = []string{}
interfaces, err := net.Interfaces()
if err != nil {
return
}
// 常见的虚拟网卡名称关键字黑名单
virtualKeywords := []string{"docker", "veth", "br-", "vmnet", "vbox", "utun", "tun", "tap", "bridge", "cloud", "hyper-"}
for _, itf := range interfaces {
// 1. 基础状态过滤：必须是启动状态且不能是回环网卡
if itf.Flags&net.FlagUp == 0 || itf.Flags&net.FlagLoopback != 0 {
continue
}
// 2. 硬件地址过滤：物理网卡通常必须有 MAC 地址
if len(itf.HardwareAddr) == 0 {
continue
}
// 3. 名称过滤：排除已知虚拟网卡前缀
name := strings.ToLower(itf.Name)
isVirtual := false
for _, kw := range virtualKeywords {
if strings.Contains(name, kw) {
isVirtual = true
break
}
}
if isVirtual {
continue
}
// 4. 提取并校验 IP
addrs, err := itf.Addrs()
if err != nil {
continue
}
for _, addr := range addrs {
ipNet, ok := addr.(*net.IPNet)
if !ok {
continue
}
ip := ipNet.IP
// 仅保留 IPv4 且必须是私有局域网地址 (10.x, 172.16.x, 192.168.x)
if ip.To4() != nil && ip.IsPrivate() {
ret = append(ret, ip.String())
}
}
}
return
}
func IsLocalHostname(hostname string) bool {
if "localhost" == hostname || strings.HasSuffix(hostname, ".localhost") {
return true

70
kernel/util/path.go
View file

@ -19,7 +19,6 @@ package util
import (
"bytes"
"io/fs"
"net"
"os"
"path"
"path/filepath"
@ -74,74 +73,7 @@ func GetLocalIPs() (ret []string) {
}
ret = []string{}
addrs, err := net.InterfaceAddrs()
if err != nil {
logging.LogWarnf("get interface addresses failed: %s", err)
return
}
IPv4Nets := []*net.IPNet{}
IPv6Nets := []*net.IPNet{}
for _, addr := range addrs {
if networkIp, ok := addr.(*net.IPNet); ok && networkIp.IP.String() != "<nil>" {
if networkIp.IP.To4() != nil {
IPv4Nets = append(IPv4Nets, networkIp)
} else if networkIp.IP.To16() != nil {
IPv6Nets = append(IPv6Nets, networkIp)
}
}
}
// loopback address
for _, net := range IPv4Nets {
if net.IP.IsLoopback() {
ret = append(ret, net.IP.String())
}
}
// private address
for _, net := range IPv4Nets {
if net.IP.IsPrivate() {
ret = append(ret, net.IP.String())
}
}
// IPv4 private address
for _, net := range IPv4Nets {
if net.IP.IsGlobalUnicast() {
ret = append(ret, net.IP.String())
}
}
// link-local unicast address
for _, net := range IPv4Nets {
if net.IP.IsLinkLocalUnicast() {
ret = append(ret, net.IP.String())
}
}
// loopback address
for _, net := range IPv6Nets {
if net.IP.IsLoopback() {
ret = append(ret, "["+net.IP.String()+"]")
}
}
// private address
for _, net := range IPv6Nets {
if net.IP.IsPrivate() {
ret = append(ret, "["+net.IP.String()+"]")
}
}
// IPv6 private address
for _, net := range IPv6Nets {
if net.IP.IsGlobalUnicast() {
ret = append(ret, "["+net.IP.String()+"]")
}
}
// link-local unicast address
for _, net := range IPv6Nets {
if net.IP.IsLinkLocalUnicast() {
ret = append(ret, "["+net.IP.String()+"]")
}
}
ret = append(ret, GetPrivateIPv4s()...)
ret = append(ret, LocalHost)
ret = gulu.Str.RemoveDuplicatedElem(ret)
return