1

diff --git a/compress/Brotli.go b/compress/Brotli.go
index 839934e33e69364dd25208741f550c6926ceefec..a2478bc00f355ddc8661b5444c89fd4d37488a17 100644 (file)
--- a/compress/Brotli.go
+++ b/compress/Brotli.go
@@ -4,7 +4,7 @@ import (
        "bytes"
        "io"
 
-       br "github.com/andybalholm/brotli"
+       br "github.com/qydysky/brotli"
 )
 
 func InBr(byteS []byte, level int) ([]byte, error) {

diff --git a/go.mod b/go.mod
index 5ff88aac75e10ee40b4ef337a9de75a98e215387..4f4410bfa9a5bf961083947dc819ccedf3370363 100644 (file)
--- a/go.mod
+++ b/go.mod
@@ -3,11 +3,10 @@ module github.com/qydysky/part
 go 1.23
 
 require (
-       github.com/andybalholm/brotli v1.1.0
        github.com/gorilla/websocket v1.5.3
        github.com/klauspost/compress v1.17.9
        github.com/miekg/dns v1.1.62
-       github.com/qydysky/brotli v0.0.0-20240828132603-e98a2bfd1d69
+       github.com/qydysky/brotli v0.0.0-20240828134800-e9913a6e7ed9
        github.com/shirou/gopsutil v3.21.11+incompatible
        github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966
        golang.org/x/crypto v0.26.0

diff --git a/go.sum b/go.sum
index 8fbae922e15a5c6d3272c63ce141effba7193ab2..bfef3c72ccef6e9046d409e68830a928b3571739 100644 (file)
--- a/go.sum
+++ b/go.sum
@@ -1,5 +1,3 @@
-github.com/andybalholm/brotli v1.1.0 h1:eLKJA0d02Lf0mVpIDgYnqXcUn0GqVmEFny3VuID1U3M=
-github.com/andybalholm/brotli v1.1.0/go.mod h1:sms7XGricyQI9K10gOSf56VKKWS4oLer58Q+mhRPtnY=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -34,8 +32,8 @@ github.com/ncruces/go-strftime v0.1.9 h1:bY0MQC28UADQmHmaF5dgpLmImcShSi2kHU9XLdh
 github.com/ncruces/go-strftime v0.1.9/go.mod h1:Fwc5htZGVVkseilnfgOVb9mKy6w1naJmn9CehxcKcls=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/qydysky/brotli v0.0.0-20240828132603-e98a2bfd1d69 h1:6zIjayJgm4vmXYB1iWmCSrg5BO+lUlP42YIcwEBx9Sw=
-github.com/qydysky/brotli v0.0.0-20240828132603-e98a2bfd1d69/go.mod h1:cI8/gy/wjy2Eb+p2IUj2ZuDnC8R5Vrx3O0VMPvMvphA=
+github.com/qydysky/brotli v0.0.0-20240828134800-e9913a6e7ed9 h1:k451T+bpsLr+Dq9Ujo+Qtx0iomRA1XXS5ttlEojvfuQ=
+github.com/qydysky/brotli v0.0.0-20240828134800-e9913a6e7ed9/go.mod h1:cI8/gy/wjy2Eb+p2IUj2ZuDnC8R5Vrx3O0VMPvMvphA=
 github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec h1:W09IVJc94icq4NjY3clb7Lk8O1qJ8BdBEF8z0ibU0rE=
 github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
 github.com/shirou/gopsutil v3.21.11+incompatible h1:+1+c1VGhc88SSonWP6foOcLhvnKlUeu/erjjvaPEYiI=

diff --git a/sys/Sys.go b/sys/Sys.go
index ff007ac3f7b07b9152050f812d24935bad0d204c..c4ab86c7197b9c15919db2ae9dede8126bef4fa1 100644 (file)
--- a/sys/Sys.go
+++ b/sys/Sys.go
@@ -206,7 +206,7 @@ func GetIpByCidr(cidr ...string) (seq iter.Seq[net.IP]) {
                                        addrs, _ := netInterfaces[i].Addrs()
 
                                        for _, address := range addrs {
-                                               if ipnet, ok := address.(*net.IPNet); ok && !ipnet.IP.IsLoopback() {
+                                               if ipnet, ok := address.(*net.IPNet); ok && !ipnet.IP.IsLoopback() && !ipnet.IP.IsUnspecified() {
                                                        if cidrN != nil && cidrN.Contains(ipnet.IP) {
                                                                if !yield(ipnet.IP) {
                                                                        return