oci/zeronet
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

More clean way to return locally found hash_ids for findHashId

Browse source
This commit is contained in:
shortcutme 2019-01-24 15:18:12 +01:00
parent fa99f3dbbe
commit e8dbf1511b
No known key found for this signature in database
GPG key ID: 5B63BAE6CB9613AE
2 changed files with 6 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/File/FileRequest.py
View file

@ -376,34 +376,18 @@ class FileRequest(object):
back = self.findHashIds(site, params["hash_ids"]) back = self.findHashIds(site, params["hash_ids"])
RateLimit.called(event_key) RateLimit.called(event_key)
# Check my hashfield my_hashes = []
if self.server.tor_manager and self.server.tor_manager.getOnion(site.address): # Running onion
my_ip = helper.packOnionAddress(self.server.tor_manager.getOnion(site.address), self.server.port)
my_ip_type = "onion"
elif config.ip_external: # External ip defined
my_ip = helper.packAddress(config.ip_external, self.server.port)
my_ip_type = helper.getIpType(config.ip_external)
elif self.server.ip and self.server.ip != "*": # No external ip defined
my_ip = helper.packAddress(self.server.ip, self.server.port)
my_ip_type = helper.getIpType(self.server.ip)
else:
my_ip = None
my_ip_type = "ipv4"
my_hashfield_set = set(site.content_manager.hashfield) my_hashfield_set = set(site.content_manager.hashfield)
for hash_id in params["hash_ids"]: for hash_id in params["hash_ids"]:
if hash_id in my_hashfield_set: if hash_id in my_hashfield_set:
if hash_id not in back[my_ip_type]: my_hashes.append(hash_id)
back[my_ip_type][hash_id] = []
if my_ip:
back[my_ip_type][hash_id].append(my_ip) # Add myself
if config.verbose: if config.verbose:
self.log.debug( self.log.debug(
"Found: %s for %s hashids in %.3fs" % "Found: %s for %s hashids in %.3fs" %
({key: len(val) for key, val in back.iteritems()}, len(params["hash_ids"]), time.time() - s) ({key: len(val) for key, val in back.iteritems()}, len(params["hash_ids"]), time.time() - s)
) )
self.response({"peers": back["ipv4"], "peers_onion": back["onion"], "peers_ipv6": back["ipv6"]}) self.response({"peers": back["ipv4"], "peers_onion": back["onion"], "peers_ipv6": back["ipv6"], "my": my_hashes})
def actionSetHashfield(self, params): def actionSetHashfield(self, params):
site = self.sites.get(params["site"]) site = self.sites.get(params["site"])

3
src/Peer/Peer.py
View file

@ -328,6 +328,9 @@ class Peer(object):
back[hash] += map(unpacker_func, peers) back[hash] += map(unpacker_func, peers)
for hash in res.get("my", []):
back[hash].append((self.connection.ip, self.connection.port))
return back return back
# Send my hashfield to peer # Send my hashfield to peer