Small fixes in tunnel and registry

registry.py

@@ -5,20 +5,6 @@ from email.mime.text import MIMEText
 from OpenSSL import crypto
 import utils
 
-# Fix for librpcxml to avoid doing reverse dns on each request
-# it was causing a 5-10s delay on each request when no reverse DNS was avalaible
-# for tis IP
-import BaseHTTPServer
-
-
-def not_insane_address_string(self):
-    host, port = self.client_address[:2]
-    return '%s (no getfqdn)' % host  # used to call: socket.getfqdn(host)
-
-BaseHTTPServer.BaseHTTPRequestHandler.address_string = not_insane_address_string
-# end of the fix
-
-
 # To generate server ca and key with serial for 2001:db8:42::/48
 # openssl req -nodes -new -x509 -key ca.key -set_serial 0x120010db80042 -days 365 -out ca.crt
 

tunnel.py

@@ -160,11 +160,11 @@ class TunnelManager:
             ip = bin(int(ip, 16))[2:].rjust(128, '0')
 
             if ip.startswith(self._network):
-                iface = iface.replace(' ', '')
+                iface = iface.strip()
                 subnet_size = int(subnet_size, 16)
                 utils.log('Route on iface %s detected to %s/%s'
                         % (iface, ip, subnet_size), 8)
-                if iface in self._iface_to_prefix.keys() and subnet_size <= 64:
+                if iface in self._iface_to_prefix.keys():
                     self._connection_dict[self._iface_to_prefix[iface]].routes += 1
                 if iface in self._iface_list and self._net_len < subnet_size < 128:
                     prefix = ip[self._net_len:subnet_size]