work on crypto

onionr/communicator.py

@@ -46,6 +46,8 @@ class OnionrCommunicate:
         blockProcessAmount = 5
         heartBeatTimer = 0
         heartBeatRate = 5
+        pexTimer = 900 # How often we should check for new peers
+        pexCount = 0
         logger.debug('Communicator debugging enabled.')
         torID = open('data/hs/hostname').read()
 

onionr/onionr.py

@@ -216,14 +216,23 @@ class Onionr:
         '''
 
         while True:
-            peer = logger.readline('Peer to send to: ')
-            if self.onionrUtils.validateID(peer):
+            try:
+                peer = logger.readline('Peer to send to: ')
+            except KeyboardInterrupt:
                 break
             else:
-                logger.error('Invalid peer ID')
-        message = logger.readline("Enter a message: ")
-        logger.info("Sending message to " + peer)
-        self.onionrUtils.sendPM(peer, message)
+                if self.onionrUtils.validateID(peer):
+                    break
+                else:
+                    logger.error('Invalid peer ID')
+        else:
+            try:
+                message = logger.readline("Enter a message: ")
+            except KeyboardInterrupt:
+                pass
+            else:
+                logger.info("Sending message to " + peer)
+                self.onionrUtils.sendPM(peer, message)
 
 
     def openGUI(self):

onionr/onionrutils.py

@@ -36,6 +36,10 @@ class OnionrUtils:
         self.fingerprintFile = 'data/own-fingerprint.txt'
         self._core = coreInstance
         return
+    
+    def sendPM(self, user, message):
+        '''High level function to encrypt a message to a peer and insert it as a block'''
+        return
 
     def localCommand(self, command):
         '''