ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2025-02-21 18:06:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

introweb.py: tolerate foolscap>=0.2.6, which changed the internals of .locationHints

Browse Source
This commit is contained in:
Brian Warner 2008-05-14 13:55:47 -07:00
parent ff0b9e2549
commit 5098297a2b
1 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/allmydata/web/introweb.py
View File

@ -78,8 +78,7 @@ class IntroducerRoot(rend.Page):
(furl, service_name, ri_name, nickname, ver, oldest) = announcement
sr = SturdyRef(furl)
nodeid = sr.tubID
advertised = [loc.split(":")[0] for loc in sr.locationHints
if not loc.startswith("127.0.0.1:")]
advertised = self.show_location_hints(sr)
ctx.fillSlots("peerid", "%s %s" % (nodeid, nickname))
ctx.fillSlots("advertised", " ".join(advertised))
ctx.fillSlots("connected", "?")
@ -124,8 +123,7 @@ class IntroducerRoot(rend.Page):
# if the subscriber didn't do Tub.setLocation, nodeid will be None
nodeid = sr.tubID or "?"
ctx.fillSlots("peerid", "%s %s" % (nodeid, nickname))
advertised = [loc.split(":")[0] for loc in sr.locationHints
if not loc.startswith("127.0.0.1:")]
advertised = self.show_location_hints(sr)
ctx.fillSlots("advertised", " ".join(advertised))
remote_host = rref.tracker.broker.transport.getPeer()
if isinstance(remote_host, address.IPv4Address):
@ -141,4 +139,21 @@ class IntroducerRoot(rend.Page):
ctx.fillSlots("service_name", service_name)
return ctx.tag
def show_location_hints(self, sr, ignore_localhost=True):
advertised = []
for hint in sr.locationHints:
if isinstance(hint, str):
# Foolscap-0.2.5 and earlier used strings in .locationHints
if ignore_localhost and hint.startswith("127.0.0.1"):
continue
advertised.append(hint.split(":")[0])
else:
# Foolscap-0.2.6 and later use tuples of ("ipv4", host, port)
if hint[0] == "ipv4":
host = hint[1]
if ignore_localhost and host == "127.0.0.1":
continue
advertised.append(hint[1])
return advertised