|
@@ -84,16 +84,11 @@ func NewCalculatedRemotesFromConfig(c *config.C, k string) (*bart.Table[[]*calcu
|
|
|
|
|
|
calculatedRemotes := new(bart.Table[[]*calculatedRemote])
|
|
calculatedRemotes := new(bart.Table[[]*calculatedRemote])
|
|
|
|
|
|
- rawMap, ok := value.(map[any]any)
|
|
|
|
|
|
+ rawMap, ok := value.(map[string]any)
|
|
if !ok {
|
|
if !ok {
|
|
return nil, fmt.Errorf("config `%s` has invalid type: %T", k, value)
|
|
return nil, fmt.Errorf("config `%s` has invalid type: %T", k, value)
|
|
}
|
|
}
|
|
- for rawKey, rawValue := range rawMap {
|
|
|
|
- rawCIDR, ok := rawKey.(string)
|
|
|
|
- if !ok {
|
|
|
|
- return nil, fmt.Errorf("config `%s` has invalid key (type %T): %v", k, rawKey, rawKey)
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
|
|
+ for rawCIDR, rawValue := range rawMap {
|
|
cidr, err := netip.ParsePrefix(rawCIDR)
|
|
cidr, err := netip.ParsePrefix(rawCIDR)
|
|
if err != nil {
|
|
if err != nil {
|
|
return nil, fmt.Errorf("config `%s` has invalid CIDR: %s", k, rawCIDR)
|
|
return nil, fmt.Errorf("config `%s` has invalid CIDR: %s", k, rawCIDR)
|
|
@@ -129,7 +124,7 @@ func newCalculatedRemotesListFromConfig(cidr netip.Prefix, raw any) ([]*calculat
|
|
}
|
|
}
|
|
|
|
|
|
func newCalculatedRemotesEntryFromConfig(cidr netip.Prefix, raw any) (*calculatedRemote, error) {
|
|
func newCalculatedRemotesEntryFromConfig(cidr netip.Prefix, raw any) (*calculatedRemote, error) {
|
|
- rawMap, ok := raw.(map[any]any)
|
|
|
|
|
|
+ rawMap, ok := raw.(map[string]any)
|
|
if !ok {
|
|
if !ok {
|
|
return nil, fmt.Errorf("invalid type: %T", raw)
|
|
return nil, fmt.Errorf("invalid type: %T", raw)
|
|
}
|
|
}
|