From 0860140223a5b35ddcd77c06cccb7e67b46ba0d1 Mon Sep 17 00:00:00 2001 From: qydysky Date: Wed, 28 Aug 2024 22:25:32 +0800 Subject: [PATCH] 1 --- compress/Brotli.go | 2 +- go.mod | 3 +-- go.sum | 6 ++---- sys/Sys.go | 2 +- 4 files changed, 5 insertions(+), 8 deletions(-) diff --git a/compress/Brotli.go b/compress/Brotli.go index 839934e..a2478bc 100644 --- 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 5ff88aa..4f4410b 100644 --- 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 8fbae92..bfef3c7 100644 --- 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 ff007ac..c4ab86c 100644 --- 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 -- 2.39.2