1 files changed, 49 insertions, 49 deletions
diff --git a/qpid/extras/dispatch/python/qpid/dispatch/router/neighbor.py b/qpid/extras/dispatch/python/qpid/dispatch/router/neighbor.py
index ea8bacd660..37b7888efe 100644
--- a/qpid/extras/dispatch/python/qpid/dispatch/router/neighbor.py
+++ b/qpid/extras/dispatch/python/qpid/dispatch/router/neighbor.py
@@ -21,63 +21,63 @@ from data import LinkState, MessageHELLO
 from time import time
 
 try:
-  from dispatch import *
+    from dispatch import *
 except ImportError:
-  from ..stubs import *
+    from ..stubs import *
 
 
 class NeighborEngine(object):
-  """
-  This module is responsible for maintaining this router's link-state.  It runs the HELLO protocol
-  with the router's neighbors and notifies outbound when the list of neighbors-in-good-standing (the
-  link-state) changes.
-  """
-  def __init__(self, container):
-    self.container = container
-    self.id = self.container.id
-    self.area = self.container.area
-    self.last_hello_time = 0.0
-    self.hello_interval = container.config.hello_interval
-    self.hello_max_age = container.config.hello_max_age
-    self.hellos = {}
-    self.link_state_changed = False
-    self.link_state = LinkState(None, self.id, self.area, 0, [])
+    """
+    This module is responsible for maintaining this router's link-state.  It runs the HELLO protocol
+    with the router's neighbors and notifies outbound when the list of neighbors-in-good-standing (the
+    link-state) changes.
+    """
+    def __init__(self, container):
+        self.container = container
+        self.id = self.container.id
+        self.area = self.container.area
+        self.last_hello_time = 0.0
+        self.hello_interval = container.config.hello_interval
+        self.hello_max_age = container.config.hello_max_age
+        self.hellos = {}
+        self.link_state_changed = False
+        self.link_state = LinkState(None, self.id, self.area, 0, [])
 
 
-  def tick(self, now):
-    self._expire_hellos(now)
+    def tick(self, now):
+        self._expire_hellos(now)
 
-    if now - self.last_hello_time >= self.hello_interval:
-      self.last_hello_time = now
-      self.container.send('_local/qdxrouter', MessageHELLO(None, self.id, self.area, self.hellos.keys()))
+        if now - self.last_hello_time >= self.hello_interval:
+            self.last_hello_time = now
+            self.container.send('amqp:/_local/qdxhello', MessageHELLO(None, self.id, self.area, self.hellos.keys()))
 
-    if self.link_state_changed:
-      self.link_state_changed = False
-      self.link_state.bump_sequence()
-      self.container.local_link_state_changed(self.link_state)
+        if self.link_state_changed:
+            self.link_state_changed = False
+            self.link_state.bump_sequence()
+            self.container.local_link_state_changed(self.link_state)
 
 
-  def handle_hello(self, msg, now):
-    if msg.id == self.id:
-      return
-    self.hellos[msg.id] = now
-    if msg.is_seen(self.id):
-      if self.link_state.add_peer(msg.id):
-        self.link_state_changed = True
-        self.container.new_neighbor(msg.id)
-        self.container.log(LOG_INFO, "New neighbor established: %s" % msg.id)
-    ##
-    ## TODO - Use this function to detect area boundaries
-    ##
+    def handle_hello(self, msg, now, link_id):
+        if msg.id == self.id:
+            return
+        self.hellos[msg.id] = now
+        if msg.is_seen(self.id):
+            if self.link_state.add_peer(msg.id):
+                self.link_state_changed = True
+                self.container.new_neighbor(msg.id, link_id)
+                self.container.log(LOG_INFO, "New neighbor established: %s on link: %d" % (msg.id, link_id))
+        ##
+        ## TODO - Use this function to detect area boundaries
+        ##
 
-  def _expire_hellos(self, now):
-    to_delete = []
-    for key, last_seen in self.hellos.items():
-      if now - last_seen > self.hello_max_age:
-        to_delete.append(key)
-    for key in to_delete:
-      self.hellos.pop(key)
-      if self.link_state.del_peer(key):
-        self.link_state_changed = True
-        self.container.lost_neighbor(key)
-        self.container.log(LOG_INFO, "Neighbor lost: %s" % key)
+    def _expire_hellos(self, now):
+        to_delete = []
+        for key, last_seen in self.hellos.items():
+            if now - last_seen > self.hello_max_age:
+                to_delete.append(key)
+        for key in to_delete:
+            self.hellos.pop(key)
+            if self.link_state.del_peer(key):
+                self.link_state_changed = True
+                self.container.lost_neighbor(key)
+                self.container.log(LOG_INFO, "Neighbor lost: %s" % key)