introducer: stop tracking hints for subscribed clients

[tahoe-lafs/tahoe-lafs.git] / src / allmydata / introducer / old.py

diff --git a/src/allmydata/introducer/old.py b/src/allmydata/introducer/old.py
index 36a9af7628bd8ef8706f90021d4ab3cc0a93bbd4..3c2fcb7122510e69bc0cc8d0f4c8ab1e2d89bbdf 100644 (file)
--- a/src/allmydata/introducer/old.py
+++ b/src/allmydata/introducer/old.py
@@ -393,7 +393,10 @@ class IntroducerService_v1(service.MultiService, Referenceable):
                      "service-name": service_name,
                      "anonymous-storage-FURL": furl,
                      }
-            ad = AnnouncementDescriptor(when, index, None, ann_d)
+            # the V2 introducer uses (service_name, key_s, tubid_s) as an
+            # index, so match that format for AnnouncementDescriptor
+            new_index = (index[0], None, idlib.nodeid_b2a(index[1]))
+            ad = AnnouncementDescriptor(when, new_index, None, ann_d)
             announcements.append(ad)
         return announcements
 
@@ -402,13 +405,11 @@ class IntroducerService_v1(service.MultiService, Referenceable):
         for service_name, subscribers in self._subscribers.items():
             for rref, when in subscribers.items():
                 tubid = rref.getRemoteTubID() or "?"
-                advertised_addresses = rrefutil.hosts_for_rref(rref)
                 remote_address = rrefutil.stringify_remote_address(rref)
                 nickname, version, app_versions = u"?", u"?", {}
                 sd = SubscriberDescriptor(service_name, when,
                                           nickname, version, app_versions,
-                                          advertised_addresses, remote_address,
-                                          tubid)
+                                          remote_address, tubid)
                 s.append(sd)
         return s