kev/Onionr
1
0
Fork 0
Code Issues 24 Pull Requests Projects Releases 2 Wiki Activity

work on chat

Browse Source
This commit is contained in:
Kevin Froman 2019-07-28 00:44:21 -05:00
parent da21999287
commit a086198ca0
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
onionr/onionrservices/bootstrapservice.py
View File

@ -24,7 +24,8 @@ from flask import Flask, Response
from netcontroller import get_open_port from netcontroller import get_open_port
from . import httpheaders from . import httpheaders
from onionrutils import stringvalidators, epoch from onionrutils import stringvalidators, epoch
import config, onionrblocks import config, onionrblocks, filepaths
import deadsimplekv as simplekv
def bootstrap_client_service(peer, onionr_inst=None, bootstrap_timeout=300): def bootstrap_client_service(peer, onionr_inst=None, bootstrap_timeout=300):
''' '''
Bootstrap client services Bootstrap client services
@ -46,6 +47,7 @@ def bootstrap_client_service(peer, onionr_inst=None, bootstrap_timeout=300):
bootstrap_address = '' bootstrap_address = ''
shutdown = False shutdown = False
bs_id = str(uuid.uuid4()) bs_id = str(uuid.uuid4())
key_store = simplekv.DeadSimpleKV(filepaths.cached_storage)
@bootstrap_app.route('/ping') @bootstrap_app.route('/ping')
def get_ping(): def get_ping():
@ -62,7 +64,7 @@ def bootstrap_client_service(peer, onionr_inst=None, bootstrap_timeout=300):
if stringvalidators.validate_transport(address + '.onion'): if stringvalidators.validate_transport(address + '.onion'):
# Set the bootstrap address then close the server # Set the bootstrap address then close the server
bootstrap_address = address + '.onion' bootstrap_address = address + '.onion'
core_inst.keyStore.put(bs_id, bootstrap_address) key_store.put(bs_id, bootstrap_address)
http_server.stop() http_server.stop()
return Response("success") return Response("success")
else: else:
@ -83,4 +85,4 @@ def bootstrap_client_service(peer, onionr_inst=None, bootstrap_timeout=300):
# This line reached when server is shutdown by being bootstrapped # This line reached when server is shutdown by being bootstrapped
# Now that the bootstrap server has received a server, return the address # Now that the bootstrap server has received a server, return the address
return onionr_inst.keyStore.get(bs_id) return key_store.get(bs_id)

2
onionr/onionrservices/connectionserver.py
View File

@ -68,7 +68,7 @@ class ConnectionServer:
try: try:
for x in range(3): for x in range(3):
attempt = basicrequests.do_post_request('http://' + address + '/bs/' + response.service_id, port=socks) attempt = basicrequests.do_post_request(comm_inst.onionrInst, 'http://' + address + '/bs/' + response.service_id, port=socks)
if attempt == 'success': if attempt == 'success':
break break
else: else: