From 197da8afcbda2b52186a429f490597f712b3ee95 Mon Sep 17 00:00:00 2001
From: Juan Font Alonso <juanfontalonso@gmail.com>
Date: Fri, 2 Sep 2022 00:04:04 +0200
Subject: [PATCH] Migrate config.go to net/netip
---
config.go | 24 +++++++++++++-----------
1 file changed, 13 insertions(+), 11 deletions(-)
diff --git a/config.go b/config.go
index 00247318..678b575d 100644
--- a/config.go
+++ b/config.go
@@ -9,11 +9,13 @@ import (
"strings"
"time"
+ "net/netip"
+
"github.com/coreos/go-oidc/v3/oidc"
"github.com/rs/zerolog"
"github.com/rs/zerolog/log"
"github.com/spf13/viper"
- "inet.af/netaddr"
+ "go4.org/netipx"
"tailscale.com/tailcfg"
"tailscale.com/types/dnstype"
)
@@ -32,7 +34,7 @@ type Config struct {
GRPCAllowInsecure bool
EphemeralNodeInactivityTimeout time.Duration
NodeUpdateCheckInterval time.Duration
- IPPrefixes []netaddr.IPPrefix
+ IPPrefixes []netip.Prefix
PrivateKeyPath string
NoisePrivateKeyPath string
BaseDomain string
@@ -340,11 +342,11 @@ func GetDNSConfig() (*tailcfg.DNSConfig, string) {
if viper.IsSet("dns_config.nameservers") {
nameserversStr := viper.GetStringSlice("dns_config.nameservers")
- nameservers := make([]netaddr.IP, len(nameserversStr))
+ nameservers := make([]netip.Addr, len(nameserversStr))
resolvers := make([]*dnstype.Resolver, len(nameserversStr))
for index, nameserverStr := range nameserversStr {
- nameserver, err := netaddr.ParseIP(nameserverStr)
+ nameserver, err := netip.ParseAddr(nameserverStr)
if err != nil {
log.Error().
Str("func", "getDNSConfig").
@@ -374,7 +376,7 @@ func GetDNSConfig() (*tailcfg.DNSConfig, string) {
len(restrictedNameservers),
)
for index, nameserverStr := range restrictedNameservers {
- nameserver, err := netaddr.ParseIP(nameserverStr)
+ nameserver, err := netip.ParseAddr(nameserverStr)
if err != nil {
log.Error().
Str("func", "getDNSConfig").
@@ -427,7 +429,7 @@ func GetHeadscaleConfig() (*Config, error) {
randomizeClientPort := viper.GetBool("randomize_client_port")
configuredPrefixes := viper.GetStringSlice("ip_prefixes")
- parsedPrefixes := make([]netaddr.IPPrefix, 0, len(configuredPrefixes)+1)
+ parsedPrefixes := make([]netip.Prefix, 0, len(configuredPrefixes)+1)
logLevelStr := viper.GetString("log_level")
logLevel, err := zerolog.ParseLevel(logLevelStr)
@@ -444,7 +446,7 @@ func GetHeadscaleConfig() (*Config, error) {
"use of 'ip_prefix' for configuration is deprecated",
"please see 'ip_prefixes' in the shipped example.",
)
- legacyPrefix, err := netaddr.ParseIPPrefix(legacyPrefixField)
+ legacyPrefix, err := netip.ParsePrefix(legacyPrefixField)
if err != nil {
panic(fmt.Errorf("failed to parse ip_prefix: %w", err))
}
@@ -452,19 +454,19 @@ func GetHeadscaleConfig() (*Config, error) {
}
for i, prefixInConfig := range configuredPrefixes {
- prefix, err := netaddr.ParseIPPrefix(prefixInConfig)
+ prefix, err := netip.ParsePrefix(prefixInConfig)
if err != nil {
panic(fmt.Errorf("failed to parse ip_prefixes[%d]: %w", i, err))
}
parsedPrefixes = append(parsedPrefixes, prefix)
}
- prefixes := make([]netaddr.IPPrefix, 0, len(parsedPrefixes))
+ prefixes := make([]netip.Prefix, 0, len(parsedPrefixes))
{
// dedup
normalizedPrefixes := make(map[string]int, len(parsedPrefixes))
for i, p := range parsedPrefixes {
- normalized, _ := p.Range().Prefix()
+ normalized, _ := netipx.RangeOfPrefix(p).Prefix()
normalizedPrefixes[normalized.String()] = i
}
@@ -475,7 +477,7 @@ func GetHeadscaleConfig() (*Config, error) {
}
if len(prefixes) < 1 {
- prefixes = append(prefixes, netaddr.MustParseIPPrefix("100.64.0.0/10"))
+ prefixes = append(prefixes, netip.MustParsePrefix("100.64.0.0/10"))
log.Warn().
Msgf("'ip_prefixes' not configured, falling back to default: %v", prefixes)
}