ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2024-12-20 21:43:09 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

introweb.py: tolerate non-setLocationed client tubs

Browse Source
This commit is contained in:
Brian Warner 2008-03-11 18:09:13 -07:00
parent 3f5abe5cba
commit fd5a922cad
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -68,7 +68,11 @@ class IntroducerRoot(rend.Page):
(service_name, rref) = s (service_name, rref) = s
sr = rref.getSturdyRef() sr = rref.getSturdyRef()
nodeid = sr.tubID nodeid = sr.tubID
ctx.fillSlots("peerid", "%s" % idlib.nodeid_b2a(nodeid)) # if the subscriber didn't do Tub.setLocation, nodeid will be None
nodeid_s = "?"
if nodeid:
nodeid_s = idlib.nodeid_b2a(nodeid)
ctx.fillSlots("peerid", nodeid_s)
advertised = [loc.split(":")[0] for loc in sr.locationHints] advertised = [loc.split(":")[0] for loc in sr.locationHints]
ctx.fillSlots("advertised", " ".join(advertised)) ctx.fillSlots("advertised", " ".join(advertised))
remote_host = rref.tracker.broker.transport.getPeer() remote_host = rref.tracker.broker.transport.getPeer()