typo

docs/re6st-registry.rst

@@ -28,7 +28,7 @@ running the re6st-registry must also have a client ( re6stnet ) running.
 USAGE
 =====
 
-The re6st-registry will automatically listen on both ipv4 and ipv6 for incomming
+The re6st-registry will automatically listen on both ipv4 and ipv6 for incoming
 request.
 
 --port port

re6st/db.py

@@ -164,9 +164,9 @@ class PeerManager:
     def handle_message(self, msg):
         script_type, arg = msg.split()
         if script_type == 'client-connect':
-            logging.info('Incomming connection from %s' % (arg,))
+            logging.info('Incoming connection from %s' % (arg,))
             prefix = utils.binFromSubnet(arg)
-            if self.tunnel_manager.checkIncommingTunnel(prefix):
+            if self.tunnel_manager.checkIncomingTunnel(prefix):
                 self.blacklist(prefix, 2)
         elif script_type == 'client-disconnect':
             self.whitelist(utils.binFromSubnet(arg))

re6st/tunnel.py

@@ -150,12 +150,9 @@ class TunnelManager:
         for prefix in self._connection_dict.keys():
             self._kill(prefix)
 
-    def checkIncommingTunnel(self, prefix):
+    def checkIncomingTunnel(self, prefix):
         if prefix in self._connection_dict:
-            if prefix >= self._prefix:
-                self._kill(prefix)
-                return True
-            else:
+            if prefix < self._prefix:
                 return False
-        else:
+            self._kill(prefix)
         return True