dxs/onionr
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

* uploads now only remove from upload queue on 'exists' for efficiency-security trade off

Browse source 
fixes #26
This commit is contained in:
Kevin Froman 2019-08-11 23:00:08 -05:00
parent 97d04440ee
commit 26b0a05d66
4 changed files with 19 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

12
onionr/communicatorutils/uploadblocks.py
View file

@ -45,12 +45,16 @@ def upload_blocks_from_communicator(comm_inst):
data = {'block': block.Block(bl).getRaw()}
proxyType = proxypicker.pick_proxy(peer)
logger.info("Uploading block to " + peer, terminal=True)
if not basicrequests.do_post_request(url, data=data, proxyType=proxyType) == False:
localcommand.local_command('waitforshare/' + bl, post=True)
finishedUploads.append(bl)
resp = basicrequests.do_post_request(url, data=data, proxyType=proxyType)
if not resp == False:
if resp == 'success':
localcommand.local_command('waitforshare/' + bl, post=True)
finishedUploads.append(bl)
elif resp == 'exists':
finishedUploads.append(bl)
for x in finishedUploads:
try:
comm_inst.blocksToUpload.remove(x)
except ValueError:
pass
comm_inst.decrementThreadCount(TIMER_NAME)
comm_inst.decrementThreadCount(TIMER_NAME)