Announce neighbours to our peers

Signed-off-by: Yohann D'ANELLO <ynerant@crans.org>

re6st/tunnel.py

@@ -531,6 +531,13 @@ class BaseTunnelManager(object):
             # XXX: Quick'n dirty way to log in a common place.
             if peer and self._prefix == self.cache.registry_prefix:
                 logging.info("%s/%s: %s", int(peer, 2), len(peer), msg)
+        elif code == 8:  # neighbours
+            # The peer announced its neighbours
+            plen = len(self._prefix)
+            prefixes = [msg[i * plen:(i + 1) * plen] for i in range(len(msg) // plen)]
+            # FIXME Store neighbours of the peer instead of printing them
+            print(utils.ipFromBin(self._network + peer) + " has neighbours: "
+                  + str(list(map(lambda prefix: utils.ipFromBin(self._network + prefix), prefixes))))
 
     def askInfo(self, prefix):
         return self.sendto(prefix, '\4' + self._info(True))
@@ -542,6 +549,18 @@ class BaseTunnelManager(object):
             rina.shim is not None,
             ))
 
+    def sendNeighbours(self, prefix):
+        # Send our connected peers to the given neighbour
+        # The message has code 8 is directly the concatenation
+        # of prefixes of neighbours
+        msg = '\x08'
+        for neighbour in self.ctl.neighbours:
+            # Don't announce ourself
+            if neighbour is None or neighbour == prefix:
+                continue
+            msg += neighbour
+        return self.sendto(prefix, msg)
+
     @staticmethod
     def _restart():
         raise utils.ReexecException(
@@ -777,6 +796,13 @@ class TunnelManager(BaseTunnelManager):
             self._next_refresh = time.time() + 5
         self.checkRoutingCache()
 
+        # Send to our all neighbours who are our neighbours
+        for neighbour in self.ctl.neighbours.keys():
+            if neighbour is None:
+                continue
+            self.sendNeighbours(neighbour)
+
+
     def babel_dump(self):
         t = time.time()
         if self._killing: