From bcfc96ddd4a10bb8890e54ec906ed3fdc6896e1b Mon Sep 17 00:00:00 2001 From: 0xdcarns Date: Thu, 21 Apr 2022 10:19:26 -0400 Subject: [PATCH] tidied go mod, fixed bug with last ipv6 addr --- go.mod | 6 ++---- go.sum | 6 ++++-- logic/networks.go | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/go.mod b/go.mod index 6ce86f2b..7c6c1c41 100644 --- a/go.mod +++ b/go.mod @@ -35,8 +35,8 @@ require ( filippo.io/edwards25519 v1.0.0-rc.1 github.com/go-ping/ping v0.0.0-20211130115550-779d1e919534 github.com/guumaster/hostctl v1.1.2 - github.com/kr/pretty v0.3.0 github.com/posthog/posthog-go v0.0.0-20211028072449-93c17c49e2b0 + github.com/seancfoley/ipaddress-go v1.1.2 ) require ( @@ -55,7 +55,6 @@ require ( github.com/google/go-cmp v0.5.7 // indirect github.com/gorilla/websocket v1.4.2 // indirect github.com/josharian/native v1.0.0 // indirect - github.com/kr/text v0.2.0 // indirect github.com/leodido/go-urn v1.2.1 // indirect github.com/mdlayher/genetlink v1.2.0 // indirect github.com/mdlayher/netlink v1.6.0 // indirect @@ -64,9 +63,8 @@ require ( github.com/opencontainers/image-spec v1.0.1 // indirect github.com/pkg/errors v0.9.1 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - github.com/rogpeppe/go-internal v1.8.0 // indirect github.com/russross/blackfriday/v2 v2.1.0 // indirect - github.com/seancfoley/ipaddress-go/ipaddr v0.0.0-20220113215635-21f206932b4b // indirect + github.com/seancfoley/bintree v1.0.1 // indirect github.com/spf13/afero v1.3.2 // indirect github.com/xtgo/uuid v0.0.0-20140804021211-a0b114877d4c // indirect golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect diff --git a/go.sum b/go.sum index 3de760c1..df439c98 100644 --- a/go.sum +++ b/go.sum @@ -209,8 +209,10 @@ github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= -github.com/seancfoley/ipaddress-go/ipaddr v0.0.0-20220113215635-21f206932b4b h1:JE6/MonwfmJEAmlvHMvOxuvyvTENYQWAp/cPE9I76P8= -github.com/seancfoley/ipaddress-go/ipaddr v0.0.0-20220113215635-21f206932b4b/go.mod h1:a9MEg04Z1myhjCrB4iU/ZeQs8fBYdSI/LnDbJ7n5Nb8= +github.com/seancfoley/bintree v1.0.1 h1:rCb5DEugf2B2DtkrxJ80CP6HT24yohDEcXPOqkQRizo= +github.com/seancfoley/bintree v1.0.1/go.mod h1:CtE6qO6/n9H3V2CAGEC0lpaYr6/OijhNaMG/dt7P70c= +github.com/seancfoley/ipaddress-go v1.1.2 h1:zeAUfL7foAPe1pIlT2agp17tgpwzU6YKuEAa2VrRKOw= +github.com/seancfoley/ipaddress-go v1.1.2/go.mod h1:gR/Gr3Sx+pzusadtM9s98e/tZjvL4YnumYTPcKoHWec= github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q= diff --git a/logic/networks.go b/logic/networks.go index 2437a117..b6cda805 100644 --- a/logic/networks.go +++ b/logic/networks.go @@ -264,7 +264,7 @@ func UniqueAddress6(networkName string, reverse bool) (string, error) { incVal := 1 if reverse { incVal = -1 - newAddr6, err = ips.GetLastAddr6(network.AddressRange) + newAddr6, err = ips.GetLastAddr6(network.AddressRange6) if err != nil { if err != nil { logger.Log(0, "UniqueAddress6Server encountered an error")