Rev3328, Fix CLI siteDownload, siteAnnounce, siteNeedFile commands
This commit is contained in:
parent
e85c5e3b36
commit
cd822156c9
3 changed files with 13 additions and 5 deletions
|
@ -10,7 +10,7 @@ class Config(object):
|
|||
|
||||
def __init__(self, argv):
|
||||
self.version = "0.6.2"
|
||||
self.rev = 3327
|
||||
self.rev = 3328
|
||||
self.argv = argv
|
||||
self.action = None
|
||||
self.config_file = "zeronet.conf"
|
||||
|
|
|
@ -106,6 +106,9 @@ class ConnectionServer(object):
|
|||
self.ips[ip] = connection
|
||||
connection.handleIncomingConnection(sock)
|
||||
|
||||
def handleMessage(self, *args, **kwargs):
|
||||
pass
|
||||
|
||||
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
|
||||
site_onion = self.tor_manager.getOnion(site.address)
|
||||
|
|
13
src/main.py
13
src/main.py
|
@ -301,6 +301,11 @@ class Actions(object):
|
|||
from Site import SiteManager
|
||||
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)
|
||||
site = Site(address)
|
||||
|
||||
|
@ -316,8 +321,8 @@ class Actions(object):
|
|||
|
||||
logging.info("Opening a simple connection server")
|
||||
global file_server
|
||||
from Connection import ConnectionServer
|
||||
file_server = ConnectionServer("127.0.0.1", 1234)
|
||||
from File import FileServer
|
||||
file_server = FileServer("127.0.0.1", 1234)
|
||||
|
||||
site = Site(address)
|
||||
|
||||
|
@ -352,8 +357,8 @@ class Actions(object):
|
|||
|
||||
logging.info("Opening a simple connection server")
|
||||
global file_server
|
||||
from Connection import ConnectionServer
|
||||
file_server = ConnectionServer("127.0.0.1", 1234)
|
||||
from File import FileServer
|
||||
file_server = FileServer("127.0.0.1", 1234)
|
||||
|
||||
site = Site(address)
|
||||
site.announce()
|
||||
|
|
Loading…
Reference in a new issue