X-Git-Url: https://git.openstreetmap.org/dns.git/blobdiff_plain/73daf6886140777c2cb93593ca62be39c43e0780..6785adb30023728600bcf715cf6c52ea1402f95c:/bin/mkgeo diff --git a/bin/mkgeo b/bin/mkgeo index bd5bfbb..1b9f87f 100755 --- a/bin/mkgeo +++ b/bin/mkgeo @@ -292,8 +292,20 @@ sub match_origin my $match; if ($cluster->{preferred} && - $cluster->{preferred}->{countries} && - grep { $_ eq $origin->{country} } @{$cluster->{preferred}->{countries}}) + $cluster->{preferred}->{origins} && + grep { $_ eq $origin->{name} } @{$cluster->{preferred}->{origins}}) + { + $match = "preferred"; + } + elsif ($cluster->{allowed} && + $cluster->{allowed}->{origins} && + grep { $_ eq $origin->{name} } @{$cluster->{allowed}->{origins}}) + { + $match = "allowed"; + } + elsif ($cluster->{preferred} && + $cluster->{preferred}->{countries} && + grep { $_ eq $origin->{country} } @{$cluster->{preferred}->{countries}}) { $match = "preferred"; }