From 629ab478b231f0275342eb832f7972786eae58ce Mon Sep 17 00:00:00 2001 From: Kristoffer Dalby Date: Thu, 18 Jul 2024 17:12:54 +0200 Subject: [PATCH 1/2] remove commented out code Signed-off-by: Kristoffer Dalby --- hscontrol/app.go | 5 ----- 1 file changed, 5 deletions(-) diff --git a/hscontrol/app.go b/hscontrol/app.go index 0a23f07d23..fe025adcbe 100644 --- a/hscontrol/app.go +++ b/hscontrol/app.go @@ -80,11 +80,6 @@ const ( registerCacheCleanup = time.Minute * 20 ) -// func init() { -// deadlock.Opts.DeadlockTimeout = 15 * time.Second -// deadlock.Opts.PrintAllCurrentGoroutines = true -// } - // Headscale represents the base app of the service. type Headscale struct { cfg *types.Config From 7e1add9ec68e50ed2477e38757b975877e06048b Mon Sep 17 00:00:00 2001 From: Kristoffer Dalby Date: Thu, 18 Jul 2024 17:13:34 +0200 Subject: [PATCH 2/2] dont test uneccessary ranges when validating prefix Signed-off-by: Kristoffer Dalby --- hscontrol/types/config.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/hscontrol/types/config.go b/hscontrol/types/config.go index 6eae9a32f8..2143d18265 100644 --- a/hscontrol/types/config.go +++ b/hscontrol/types/config.go @@ -619,7 +619,6 @@ func PrefixV4() (*netip.Prefix, error) { builder := netipx.IPSetBuilder{} builder.AddPrefix(tsaddr.CGNATRange()) - builder.AddPrefix(tsaddr.TailscaleULARange()) ipSet, _ := builder.IPSet() if !ipSet.ContainsPrefix(prefixV4) { log.Warn(). @@ -643,7 +642,6 @@ func PrefixV6() (*netip.Prefix, error) { } builder := netipx.IPSetBuilder{} - builder.AddPrefix(tsaddr.CGNATRange()) builder.AddPrefix(tsaddr.TailscaleULARange()) ipSet, _ := builder.IPSet()