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

Rev3328, Fix CLI siteDownload, siteAnnounce, siteNeedFile commands

Browse source
This commit is contained in:
shortcutme 2018-02-13 13:18:40 +01:00
parent e85c5e3b36
commit cd822156c9
No known key found for this signature in database
GPG key ID: 5B63BAE6CB9613AE
3 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Config.py
View file

@ -10,7 +10,7 @@ class Config(object):
def __init__(self, argv): def __init__(self, argv):
self.version = "0.6.2" self.version = "0.6.2"
self.rev = 3327 self.rev = 3328
self.argv = argv self.argv = argv
self.action = None self.action = None
self.config_file = "zeronet.conf" self.config_file = "zeronet.conf"

3
src/Connection/ConnectionServer.py
View file

@ -106,6 +106,9 @@ class ConnectionServer(object):
self.ips[ip] = connection self.ips[ip] = connection
connection.handleIncomingConnection(sock) connection.handleIncomingConnection(sock)
def handleMessage(self, *args, **kwargs):
pass
def getConnection(self, ip=None, port=None, peer_id=None, create=True, site=None): def getConnection(self, ip=None, port=None, peer_id=None, create=True, site=None):
if ip.endswith(".onion") and self.tor_manager.start_onions and site: # Site-unique connection for Tor if ip.endswith(".onion") and self.tor_manager.start_onions and site: # Site-unique connection for Tor
site_onion = self.tor_manager.getOnion(site.address) site_onion = self.tor_manager.getOnion(site.address)

13
src/main.py
View file

@ -301,6 +301,11 @@ class Actions(object):
from Site import SiteManager from Site import SiteManager
SiteManager.site_manager.load() SiteManager.site_manager.load()
logging.info("Opening a simple connection server")
global file_server
from File import FileServer
file_server = FileServer("127.0.0.1", 1234)
logging.info("Announcing site %s to tracker..." % address) logging.info("Announcing site %s to tracker..." % address)
site = Site(address) site = Site(address)
@ -316,8 +321,8 @@ class Actions(object):
logging.info("Opening a simple connection server") logging.info("Opening a simple connection server")
global file_server global file_server
from Connection import ConnectionServer from File import FileServer
file_server = ConnectionServer("127.0.0.1", 1234) file_server = FileServer("127.0.0.1", 1234)
site = Site(address) site = Site(address)
@ -352,8 +357,8 @@ class Actions(object):
logging.info("Opening a simple connection server") logging.info("Opening a simple connection server")
global file_server global file_server
from Connection import ConnectionServer from File import FileServer
file_server = ConnectionServer("127.0.0.1", 1234) file_server = FileServer("127.0.0.1", 1234)
site = Site(address) site = Site(address)
site.announce() site.announce()