work on sockets

onionr/communicator2.py

@@ -489,7 +489,7 @@ class OnionrCommunicatorDaemon:
         else:
             del self.sockets[mySocket.socketID] # Delete socket if we have no handler for it
 
-        threading.Thread(target=sockProgram, args=(self, mySocket)).start()
+        threading.Thread(target=sockProgram, args=(self, mySocket.socketID)).start()
         mySocket.startConn()
 
     def uploadBlock(self):

onionr/netcontroller.py

@@ -72,6 +72,8 @@ class NetController:
 
         controlPort = random.randint(1025, 65535)
 
+        config.set('tor.controlPort', controlPort, savefile=True)
+
         hashedPassword = subprocess.Popen([self.torBinary, '--hash-password', plaintext], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
         for line in iter(hashedPassword.stdout.readline, b''):
             password = line.decode()

onionr/onionr.py

@@ -271,7 +271,8 @@ class Onionr:
     '''
 
     def startChat(self):
-        socketInfo = json.dumps({'peer': '', 'address': '', 'port': 1337, 'create': True, 'reason': 'chat'})
+        peer = sys.argv[2]
+        socketInfo = json.dumps({'peer': '', 'address': peer, 'port': 1337, 'create': True, 'reason': 'chat'})
         self.onionrCore.daemonQueueAdd('startSocket', socketInfo)
 
     def getCommands(self):

onionr/onionrchat.py

@@ -19,12 +19,13 @@
 '''
 import logger, time
 class OnionrChat:
-    def __init__(self, communicatorInst, socketInst):
+    def __init__(self, communicatorInst, socketID):
         self.communicator = communicatorInst
-        self.socket = socketInst
+        self.socket = self.communicator.sockets[socketID]
 
         while True:
             time.sleep(2)
-            logger.info(self.socket.readData())
+            logger.info('Chat: got %s' % (self.socket.getReadData(),))
-            self.socket.sendData('rekt')
+            time.sleep(1)
+            self.socket.addSendData('rekt')
         return

onionr/onionrsockets.py

@@ -18,7 +18,7 @@
     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 '''
 import stem.control
-import socket, selectors, socks, config
+import socket, selectors, socks, config, uuid
 import onionrexceptions, time, onionrchat
 from dependencies import secrets
 sel = selectors.DefaultSelector()
@@ -53,8 +53,9 @@ class OnionrSockets:
 
         self.readData = []
         self.sendData = 0  
+        config.reload()
 
-    def startConn():
+    def startConn(self):
         if self.isServer:
             self.createServer()
         else:
@@ -68,8 +69,8 @@ class OnionrSockets:
         ourInternalPort = 1338
 
         # Setup the empheral HS
-        with stem.control.Controller.from_port() as controller:
+        with stem.control.Controller.from_port(port=config.get('tor.controlPort')) as controller:
-            controller.authenticate()
+            controller.authenticate(config.get('tor.controlpassword'))
             socketHS = controller.create_ephemeral_hidden_service({ourPort: ourInternalPort}, await_publication = True)
             ourAddress = socketHS.service_id
 
@@ -108,14 +109,14 @@ class OnionrSockets:
             sel.unregister(conn)
             conn.close()
 
-    def sendData(self, data):
+    def addSendData(self, data):
         try:
             data = data.encode()
         except AttributeError:
             pass
         self.sendData = data
     
-    def readData(self):
+    def getReadData(self):
         try:
             data = self.readData.pop(0)
         except IndexError: