|
@@ -96,7 +96,7 @@ class MsgHandler(SocketServer.BaseRequestHandler):
|
|
|
def resolve_name(self, ipaddr):
|
|
|
"""
|
|
|
Resolves the host name of the given IP address
|
|
|
- and strips away the suffix ((.srv)?.infra)?.ffpb
|
|
|
+ and strips away the suffix ((.srv)?.in)?.ffho.net.
|
|
|
"""
|
|
|
|
|
|
if ipaddr.startswith("127."):
|
|
@@ -105,7 +105,10 @@ class MsgHandler(SocketServer.BaseRequestHandler):
|
|
|
try:
|
|
|
addr = dns.reversename.from_address(ipaddr)
|
|
|
ptr = str(ffpb_resolver.query(addr, "PTR")[0])
|
|
|
- return re.sub("^bb.", "", re.sub("((.srv)?.infra)?.ffpb.", "", ptr))
|
|
|
+ ptr = re.sub("^bb.", "", ptr)
|
|
|
+ ptr = re.sub("((.srv)?.in)?.ffho.net.", "", ptr)
|
|
|
+ ptr = re.sub("((.srv)?.infra)?.ffpb.", "", ptr)
|
|
|
+ return ptr
|
|
|
except dns.resolver.NXDOMAIN:
|
|
|
return ipaddr
|
|
|
|