small cleanups (#2017)

This commit is contained in:
Kristoffer Dalby 2024-07-19 09:21:14 +02:00 committed by GitHub
parent 11fde62b8c
commit ca47d6f353
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 0 additions and 7 deletions

View file

@ -80,11 +80,6 @@ const (
registerCacheCleanup = time.Minute * 20 registerCacheCleanup = time.Minute * 20
) )
// func init() {
// deadlock.Opts.DeadlockTimeout = 15 * time.Second
// deadlock.Opts.PrintAllCurrentGoroutines = true
// }
// Headscale represents the base app of the service. // Headscale represents the base app of the service.
type Headscale struct { type Headscale struct {
cfg *types.Config cfg *types.Config

View file

@ -619,7 +619,6 @@ func PrefixV4() (*netip.Prefix, error) {
builder := netipx.IPSetBuilder{} builder := netipx.IPSetBuilder{}
builder.AddPrefix(tsaddr.CGNATRange()) builder.AddPrefix(tsaddr.CGNATRange())
builder.AddPrefix(tsaddr.TailscaleULARange())
ipSet, _ := builder.IPSet() ipSet, _ := builder.IPSet()
if !ipSet.ContainsPrefix(prefixV4) { if !ipSet.ContainsPrefix(prefixV4) {
log.Warn(). log.Warn().
@ -643,7 +642,6 @@ func PrefixV6() (*netip.Prefix, error) {
} }
builder := netipx.IPSetBuilder{} builder := netipx.IPSetBuilder{}
builder.AddPrefix(tsaddr.CGNATRange())
builder.AddPrefix(tsaddr.TailscaleULARange()) builder.AddPrefix(tsaddr.TailscaleULARange())
ipSet, _ := builder.IPSet() ipSet, _ := builder.IPSet()