Rev3328, Fix CLI siteDownload, siteAnnounce, siteNeedFile commands

Author: shortcutme

src/Config.py

@@ -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"

src/Connection/ConnectionServer.py

@@ -106,6 +106,9 @@ def handleIncomingConnection(self, sock, addr):
             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)

src/main.py

@@ -301,6 +301,11 @@ def siteAnnounce(self, address):
         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 @@ def siteDownload(self, address):
 
         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 @@ def checker():
 
         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()