From b46192f23589bb710402e90d290d8e6f6465ae6b Mon Sep 17 00:00:00 2001 From: Alexandre Dulaunoy Date: Sun, 19 Feb 2012 18:07:09 +0100 Subject: [PATCH] __origin now returns (ASN,CC) --- DomainClassifier/domainclassifier.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/DomainClassifier/domainclassifier.py b/DomainClassifier/domainclassifier.py index c6f0456..b012411 100644 --- a/DomainClassifier/domainclassifier.py +++ b/DomainClassifier/domainclassifier.py @@ -40,7 +40,8 @@ class Extract: a = self.presolver.query(clook, 'TXT') if a: x = str(a[0]).split("|") - return x[2].strip() + x = map (lambda t: t.strip(), x) + return (x[0],x[2]) else: return None @@ -94,12 +95,12 @@ class Extract: for dom in self.validdomain: if dom[1] == 'A': ip = dom[2] - orig = self.__origin(ipaddr=dom[2]) + orig = self.__origin(ipaddr=dom[2])[1] if(orig == cc): self.localdom.append(dom) elif dom[1] == 'CNAME': cname = str(dom[2]) ip = socket.gethostbyname(cname) - orig = self.__origin(ipaddr=ip) + orig = self.__origin(ipaddr=ip)[1] if(orig == cc): self.localdom.append(dom) return self.localdom