The second version of this patch does this in a more Pythonic way.
Signed-off-by: Peter Müller peter.mueller@ipfire.org --- src/python/location-importer.in | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-)
diff --git a/src/python/location-importer.in b/src/python/location-importer.in index da058d3..3ad335f 100644 --- a/src/python/location-importer.in +++ b/src/python/location-importer.in @@ -574,6 +574,21 @@ class CLI(object): # be suitable for libloc consumption... return True
+ def _check_parsed_asn(self, asn): + """ + Assistive function to filter Autonomous System Numbers not being suitable + for adding to our database. Returns False in such cases, and True otherwise. + """ + + validranges = ((1,23455), (23457,64495), (131072, 4199999999)) + + for singlerange in validranges: + if singlerange[0] <= asn and singlerange[1] >= asn: + return True + + log.info("Supplied ASN %s out of publicly routable ASN ranges" % asn) + return False + def _parse_block(self, block, source_key, validcountries = None): # Get first line to find out what type of block this is line = block[0] @@ -829,8 +844,8 @@ class CLI(object): log.debug("Skipping ARIN AS names line not containing an integer for ASN") continue
- if not ((1 <= asn and asn <= 23455) or (23457 <= asn and asn <= 64495) or (131072 <= asn and asn <= 4199999999)): - log.debug("Skipping ARIN AS names line not containing a valid ASN: %s" % asn) + # Filter invalid ASNs... + if not self._check_parsed_asn(asn): continue
# Skip any AS name that appears to be a placeholder for a different RIR or entity...