Drop experimental support of RINA

re6st/tunnel.py

@@ -3,7 +3,7 @@ import subprocess, struct, sys, time, weakref
 from collections import defaultdict, deque
 from bisect import bisect, insort
 from OpenSSL import crypto
-from . import ctl, plib, rina, utils, version, x509
+from . import ctl, plib, utils, version, x509
 
 PORT = 326
 
@@ -197,7 +197,6 @@ class BaseTunnelManager(object):
 
     _geoiplookup = None
     _forward = None
-    _next_rina = True
 
     def __init__(self, control_socket, cache, cert, conf_country, address=()):
         self.cert = cert
@@ -281,9 +280,6 @@ class BaseTunnelManager(object):
         self.ctl.select(r, w, t)
 
     def refresh(self):
-        if self._next_rina and rina.update(self, False):
-            self._next_rina = False
-            self.__request_dump('rina')
         self._next_refresh = time.time() + self.cache.hello
         self.checkRoutingCache()
 
@@ -296,10 +292,6 @@ class BaseTunnelManager(object):
             self.ctl.request_dump()
         requesting_dump.add(reason)
 
-    def _babel_dump_rina(self):
-        rina.update(self, True)
-        self._next_rina = True
-
     def babel_dump(self):
         for x in self.__requesting_dump:
             getattr(self, '_babel_dump_' + x)()
@@ -508,17 +500,7 @@ class BaseTunnelManager(object):
                     if code == 3 and tunnel_killer.state == 'locked': # response
                         self._kill(peer)
         elif code == 4: # node information
-            if msg:
-                if not peer:
-                    return
-                try:
-                    ask, ver, protocol, rina_enabled = json.loads(msg)
-                except ValueError:
-                    ask = rina_enabled = False
-                rina.enabled(self, peer, rina_enabled)
-                if ask:
-                    return self._info(False)
-            else:
+            if not msg:
                 return "%s, %s" % (version.version, platform.platform())
         elif code == 5:
             # the registry wants to know the topology for debugging purpose
@@ -532,16 +514,6 @@ class BaseTunnelManager(object):
             if peer and self._prefix == self.cache.registry_prefix:
                 logging.info("%s/%s: %s", int(peer, 2), len(peer), msg)
 
-    def askInfo(self, prefix):
-        return self.sendto(prefix, '\4' + self._info(True))
-
-    def _info(self, ask):
-        return json.dumps((ask,
-            version.version,
-            version.protocol,
-            rina.shim is not None,
-            ))
-
     @staticmethod
     def _restart():
         raise utils.ReexecException(
@@ -805,7 +777,6 @@ class TunnelManager(BaseTunnelManager):
         #if remove and len(self._connecting) < len(self._free_iface_list):
         #    self._tuntap(self._free_iface_list.pop())
         self._next_refresh = time.time() + 5
-        rina.update(self, True)
 
     def _cleanDeads(self):
         disconnected = False

re6st/x509.py

@@ -215,8 +215,6 @@ class Peer(object):
     def connected(self):
         return self._last is None or time.time() < self._last + 60
 
-    subject_serial = Cert.subject_serial
-
     def __ne__(self, other):
         raise AssertionError
     __eq__ = __ge__ = __le__ = __ne__