From 0a1db89d33060e78dc3e6019106b5fe9d6fc670d Mon Sep 17 00:00:00 2001 From: Csaba Sarkadi Date: Sat, 29 Jan 2022 16:27:36 +0100 Subject: [PATCH] fixup! cmd/headscale/cli/utils: merge ip_prefix with ip_prefixes in config --- cmd/headscale/cli/utils.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cmd/headscale/cli/utils.go b/cmd/headscale/cli/utils.go index af766085..6047211c 100644 --- a/cmd/headscale/cli/utils.go +++ b/cmd/headscale/cli/utils.go @@ -251,7 +251,8 @@ func getHeadscaleConfig() headscale.Config { // dedup normalizedPrefixes := make(map[string]int, len(parsedPrefixes)) for i, p := range parsedPrefixes { - normalizedPrefixes[p.String()] = i + normalized, _ := p.Range().Prefix() + normalizedPrefixes[normalized.String()] = i } // convert back to list @@ -265,6 +266,8 @@ func getHeadscaleConfig() headscale.Config { log.Warn().Msgf("'ip_prefixes' not configured, falling back to default: %v", prefixes) } + log.Warn().Msgf("==> %v", prefixes) + return headscale.Config{ ServerURL: viper.GetString("server_url"), Addr: viper.GetString("listen_addr"),