diff --git a/go.mod b/go.mod index 5b8c57f4..9af8eced 100644 --- a/go.mod +++ b/go.mod @@ -17,6 +17,7 @@ require ( github.com/google/renameio v1.0.1 github.com/google/uuid v1.3.0 github.com/insomniacslk/dhcp v0.0.0-20221215072855-de60144f33f8 + github.com/josharian/native v1.1.1-0.20230202152459-5c7d0dd6ab86 github.com/kardianos/service v1.2.2 github.com/mdlayher/ethernet v0.0.0-20220221185849-529eae5b6118 github.com/mdlayher/netlink v1.7.1 @@ -29,7 +30,7 @@ require ( golang.org/x/crypto v0.7.0 golang.org/x/exp v0.0.0-20230321023759-10a507213a29 golang.org/x/net v0.8.0 - golang.org/x/sys v0.6.0 + golang.org/x/sys v0.7.0 gopkg.in/natefinch/lumberjack.v2 v2.2.1 gopkg.in/yaml.v3 v3.0.1 howett.net/plist v1.0.0 @@ -45,7 +46,6 @@ require ( github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect github.com/golang/mock v1.6.0 // indirect github.com/google/pprof v0.0.0-20230323073829-e72429f035bd // indirect - github.com/josharian/native v1.1.0 // indirect github.com/mdlayher/raw v0.1.0 // indirect github.com/mdlayher/socket v0.4.0 // indirect github.com/onsi/ginkgo/v2 v2.9.2 // indirect diff --git a/go.sum b/go.sum index 7e93f138..d522e255 100644 --- a/go.sum +++ b/go.sum @@ -70,8 +70,8 @@ github.com/insomniacslk/dhcp v0.0.0-20221215072855-de60144f33f8/go.mod h1:m5WMe0 github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= github.com/josharian/native v1.0.0/go.mod h1:7X/raswPFr05uY3HiLlYeyQntB6OO7E/d2Cu7qoaN2w= github.com/josharian/native v1.0.1-0.20221213033349-c1e37c09b531/go.mod h1:7X/raswPFr05uY3HiLlYeyQntB6OO7E/d2Cu7qoaN2w= -github.com/josharian/native v1.1.0 h1:uuaP0hAbW7Y4l0ZRQ6C9zfb7Mg1mbFKry/xzDAfmtLA= -github.com/josharian/native v1.1.0/go.mod h1:7X/raswPFr05uY3HiLlYeyQntB6OO7E/d2Cu7qoaN2w= +github.com/josharian/native v1.1.1-0.20230202152459-5c7d0dd6ab86 h1:elKwZS1OcdQ0WwEDBeqxKwb7WB62QX8bvZ/FJnVXIfk= +github.com/josharian/native v1.1.1-0.20230202152459-5c7d0dd6ab86/go.mod h1:aFAMtuldEgx/4q7iSGazk22+IcgvtiC+HIimFO9XlS8= github.com/jsimonetti/rtnetlink v0.0.0-20190606172950-9527aa82566a/go.mod h1:Oz+70psSo5OFh8DBl0Zv2ACw7Esh6pPUphlvZG9x7uw= github.com/jsimonetti/rtnetlink v0.0.0-20200117123717-f846d4f6c1f4/go.mod h1:WGuG/smIU4J/54PblvSbh+xvCZmpJnFgr3ds6Z55XMQ= github.com/jsimonetti/rtnetlink v0.0.0-20201009170750-9c6f07d100c1/go.mod h1:hqoO/u39cqLeBLebZ8fWdE96O7FxrAsRYhnVOdgHxok= @@ -218,8 +218,9 @@ golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220209214540-3681064d5158/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220622161953-175b2fd9d664/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.6.0 h1:MVltZSvRTcU2ljQOhs94SXPftV6DCNnZViHeQps87pQ= -golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.4.1-0.20230131160137-e7d7f63158de/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.7.0 h1:3jlCCIQZPdOYu1h8BkNvLz8Kgwtae2cagcG/VamtZRU= +golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= diff --git a/internal/aghos/endian_big.go b/internal/aghos/endian_big.go deleted file mode 100644 index d825023e..00000000 --- a/internal/aghos/endian_big.go +++ /dev/null @@ -1,10 +0,0 @@ -//go:build mips || mips64 - -// This file is an adapted version of github.com/josharian/native. - -package aghos - -import "encoding/binary" - -// NativeEndian is the native endianness of this system. -var NativeEndian = binary.BigEndian diff --git a/internal/aghos/endian_little.go b/internal/aghos/endian_little.go deleted file mode 100644 index 22845305..00000000 --- a/internal/aghos/endian_little.go +++ /dev/null @@ -1,10 +0,0 @@ -//go:build amd64 || 386 || arm || arm64 || mipsle || mips64le || ppc64le - -// This file is an adapted version of github.com/josharian/native. - -package aghos - -import "encoding/binary" - -// NativeEndian is the native endianness of this system. -var NativeEndian = binary.LittleEndian diff --git a/internal/home/authglinet.go b/internal/home/authglinet.go index 213d52f9..81fe8065 100644 --- a/internal/home/authglinet.go +++ b/internal/home/authglinet.go @@ -10,8 +10,8 @@ import ( "time" "github.com/AdguardTeam/AdGuardHome/internal/aghio" - "github.com/AdguardTeam/AdGuardHome/internal/aghos" "github.com/AdguardTeam/golibs/log" + "github.com/josharian/native" ) // GLMode - enable GL-Inet compatibility mode @@ -102,7 +102,7 @@ func glGetTokenDate(file string) uint32 { buf := bytes.NewBuffer(bs) - err = binary.Read(buf, aghos.NativeEndian, &dateToken) + err = binary.Read(buf, native.Endian, &dateToken) if err != nil { log.Error("decoding token: %s", err) diff --git a/internal/home/authglinet_test.go b/internal/home/authglinet_test.go index ef20ebf8..40372590 100644 --- a/internal/home/authglinet_test.go +++ b/internal/home/authglinet_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - "github.com/AdguardTeam/AdGuardHome/internal/aghos" + "github.com/josharian/native" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) @@ -19,13 +19,13 @@ func TestAuthGL(t *testing.T) { glFilePrefix = dir + "/gl_token_" data := make([]byte, 4) - aghos.NativeEndian.PutUint32(data, 1) + native.Endian.PutUint32(data, 1) require.NoError(t, os.WriteFile(glFilePrefix+"test", data, 0o644)) assert.False(t, glCheckToken("test")) data = make([]byte, 4) - aghos.NativeEndian.PutUint32(data, uint32(time.Now().UTC().Unix()+60)) + native.Endian.PutUint32(data, uint32(time.Now().UTC().Unix()+60)) require.NoError(t, os.WriteFile(glFilePrefix+"test", data, 0o644)) r, _ := http.NewRequest(http.MethodGet, "http://localhost/", nil)