summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMario Izquierdo (mariodebian) <mariodebian@gmail.com>2012-02-05 21:56:14 +0100
committerMario Izquierdo (mariodebian) <mariodebian@gmail.com>2012-02-05 21:56:14 +0100
commite23709d75a274c50c6c324f6779fcaeba47895c6 (patch)
tree52723f1da3eab90dd40c32016aee244c8262d8cf
parentf7f156d51a6d19e04102a9f65b866337e588f516 (diff)
Fix print_debug() typo in lookup() and do a revlookup in all nameservers
-rw-r--r--tcosmonitor/TcosCommon.py21
1 files changed, 11 insertions, 10 deletions
diff --git a/tcosmonitor/TcosCommon.py b/tcosmonitor/TcosCommon.py
index 4b37a6d..ba18d13 100644
--- a/tcosmonitor/TcosCommon.py
+++ b/tcosmonitor/TcosCommon.py
@@ -178,14 +178,15 @@ class TcosCommon:
b = ".".join(a)+'.in-addr.arpa'
# this will only return one of any records returned.
response=_("unknow")
- try:
- c=DNS.Base.DnsRequest(b, qtype = 'ptr', timeout=0.2).req()
- response=c.answers[0]['data']
- except DNS.Base.DNSError, err:
- print_debug("revlookup() Exception Timeout, error=%s"%err)
- except IndexError, err:
- #print_debug("revlookup() Exception IndexError, error=%s"%err)
- return _("unknow")
+ for nameserver in DNS.Base.defaults['server']:
+ try:
+ print_debug("revlookup() reverse name=%s"%b)
+ c=DNS.Base.DnsRequest(b, qtype = 'ptr', timeout=0.2, server=nameserver).req()
+ response=c.answers[0]['data']
+ except DNS.Base.DNSError, err:
+ print_debug("revlookup() nameserver=%s Exception Timeout, error=%s"%(nameserver,err))
+ except IndexError, err:
+ print_debug("revlookup() nameserver=%s Exception IndexError, error=%s"%(nameserver,err))
return response
def lookup(self, name):
@@ -199,9 +200,9 @@ class TcosCommon:
c=DNS.Base.DnsRequest(name, qtype = 'a', timeout=0.2, server=nameserver).req()
response=c.answers[0]['data']
except DNS.Base.DNSError, err:
- print_debug("revlookup() nameserver=%s Exception Timeout, error=%s"%(nameserver,err))
+ print_debug("lookup() nameserver=%s Exception Timeout, error=%s"%(nameserver,err))
except IndexError, err:
- print_debug("revlookup() nameserver=%s Exception IndexError, error=%s"%(nameserver, err))
+ print_debug("lookup() nameserver=%s Exception IndexError, error=%s"%(nameserver, err))
return response
def DNSgethostbyaddr(self, ip):