From 15aa395946256a3520352dd372a21672d49b9351 Mon Sep 17 00:00:00 2001
From: Kevin Froman <beardog@firemail.cc>
Date: Wed, 28 Feb 2018 03:06:02 -0600
Subject: [PATCH] work on crypto

---
 onionr/communicator.py |  2 ++
 onionr/onionr.py       | 21 +++++++++++++++------
 onionr/onionrutils.py  |  4 ++++
 3 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/onionr/communicator.py b/onionr/communicator.py
index 3fe60169..d1bc9ef4 100755
--- a/onionr/communicator.py
+++ b/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()
 
diff --git a/onionr/onionr.py b/onionr/onionr.py
index ee18f02c..2792b9e1 100755
--- a/onionr/onionr.py
+++ b/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):
diff --git a/onionr/onionrutils.py b/onionr/onionrutils.py
index 35ba38e3..a0db7570 100644
--- a/onionr/onionrutils.py
+++ b/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):
         '''