Git-Mirrors/onionshare
1
0
Fork 0
mirror of https://github.com/onionshare/onionshare.git synced 2025-08-13 00:25:51 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #245 from garrettr/wait-for-ephemeral-hs

Browse source 
Revert to using wait_for_hs for ephemeral HS
This commit is contained in:
Micah Lee 2016-01-05 18:37:44 -08:00
commit 4c40b89faf
3 changed files with 6 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
onionshare/hs.py
View file

@ -87,7 +87,7 @@ class HS(object):
print strings._("connecting_ctrlport").format(int(port)) print strings._("connecting_ctrlport").format(int(port))
if self.supports_ephemeral: if self.supports_ephemeral:
print strings._('using_ephemeral') print strings._('using_ephemeral')
res = self.c.create_ephemeral_hidden_service({ 80: port }, await_publication = True) res = self.c.create_ephemeral_hidden_service({ 80: port }, await_publication = False)
self.service_id = res.content()[0][2].split('=')[1] self.service_id = res.content()[0][2].split('=')[1]
onion_host = res.content()[0][2].split('=')[1] + '.onion' onion_host = res.content()[0][2].split('=')[1] + '.onion'
return onion_host return onion_host

7
onionshare/onionshare.py
View file

@ -159,10 +159,9 @@ def main(cwd=None):
try: # Trap Ctrl-C try: # Trap Ctrl-C
# wait for hs, only if using old version of tor # wait for hs, only if using old version of tor
if not app.local_only: if not app.local_only:
if not app.hs.supports_ephemeral: ready = app.hs.wait_for_hs(app.onion_host)
ready = app.hs.wait_for_hs(app.onion_host) if not ready:
if not ready: sys.exit()
sys.exit()
print strings._("give_this_url") print strings._("give_this_url")
print 'http://{0:s}/{1:s}'.format(app.onion_host, web.slug) print 'http://{0:s}/{1:s}'.format(app.onion_host, web.slug)

5
onionshare_gui/onionshare_gui.py
View file

@ -168,9 +168,8 @@ class OnionShareGui(QtGui.QWidget):
# wait for hs # wait for hs
if not self.app.local_only: if not self.app.local_only:
if not self.app.hs.supports_ephemeral: self.status_bar.showMessage(strings._('gui_starting_server3', True))
self.status_bar.showMessage(strings._('gui_starting_server3', True)) self.app.hs.wait_for_hs(self.app.onion_host)
self.app.hs.wait_for_hs(self.app.onion_host)
# done # done
self.start_server_finished.emit() self.start_server_finished.emit()