5 files changed, 17 insertions, 8 deletions

diff --git a/src/Crypto/Tox.hs b/src/Crypto/Tox.hs
index acb98e3e..864e17df 100644
--- a/src/Crypto/Tox.hs
+++ b/src/Crypto/Tox.hs
@@ -527,7 +527,7 @@ data TransportCrypto = TransportCrypto
     , rendezvousPublic :: PublicKey
     , transportSymmetric :: STM SymmetricKey
     , transportNewNonce :: STM Nonce24
-    , userKeys :: TVar [(SecretKey,PublicKey)]
+    , userKeys :: STM [(SecretKey,PublicKey)]
     , pendingCookies :: TVar [(SockAddr, (Int, PublicKey))]
     , secretsCache :: SecretsCache
     }
diff --git a/src/Network/Tox.hs b/src/Network/Tox.hs
index a3291a0f..69982c81 100644
--- a/src/Network/Tox.hs
+++ b/src/Network/Tox.hs
@@ -145,7 +145,7 @@ newCrypto = do
             let (nonce, drg2) = withDRG drg1 (Nonce24 <$> getRandomBytes 24)
             writeTVar noncevar drg2
             return nonce
-        , userKeys = ukeys
+        , userKeys = return []
         , pendingCookies = cookieKeys
         , secretsCache = cache
         }
@@ -415,11 +415,13 @@ newTox keydb addr mbSessionsState suppliedDHTKey = do
                                     return (crypto,sessionsState)
                                  Just s -> return (transportCrypto s, s)
 
+    roster <- newContactInfo
     let crypto = fromMaybe crypto0 $do
             k <- suppliedDHTKey
             return crypto0
                 { transportSecret = k
                 , transportPublic = toPublic k
+                , userKeys = myKeyPairs roster
                 }
     forM_ suppliedDHTKey $ \k -> do
         maybe (hPutStrLn stderr "failed to encode suppliedDHTKey")
@@ -433,7 +435,8 @@ newTox keydb addr mbSessionsState suppliedDHTKey = do
     let ignoreErrors _ = return () -- Set this to (hPutStrLn stderr) to debug onion route building.
     orouter <- newOnionRouter ignoreErrors
     (dhtcrypt,onioncrypt,dtacrypt,cryptonet) <- toxTransport crypto orouter lookupClose udp
-    let sessionsState = sessionsState0 { sessionTransport = cryptonet }
+    let sessionsState = sessionsState0 { sessionTransport = cryptonet
+                                       , transportCrypto = crypto }
     let dhtnet0 = layerTransportM (DHT.decrypt crypto) (DHT.encrypt crypto) dhtcrypt
         tbl4 = DHT.routing4 $ mkrouting (error "missing client")
         tbl6 = DHT.routing6 $ mkrouting (error "missing client")
@@ -453,7 +456,6 @@ newTox keydb addr mbSessionsState suppliedDHTKey = do
                     (hookQueries orouter DHT.transactionKey)
                     (const id)
 
-    roster <- newContactInfo
     return Tox
         { toxDHT            = dhtclient
         , toxOnion          = onionclient
diff --git a/src/Network/Tox/ContactInfo.hs b/src/Network/Tox/ContactInfo.hs
index d9d9a510..df3365a2 100644
--- a/src/Network/Tox/ContactInfo.hs
+++ b/src/Network/Tox/ContactInfo.hs
@@ -12,10 +12,11 @@ import qualified Data.HashMap.Strict as HashMap
 import Data.Maybe
 import qualified Data.Set            as Set
          ;import Data.Set            (Set)
+import Network.Socket
 import Network.Tox.DHT.Transport     as DHT
+import Network.Tox.NodeId            (id2key)
 import Network.Tox.Onion.Transport   as Onion
 import System.IO
-import Network.Socket
 
 newtype ContactInfo = ContactInfo
       -- | Map our toxid public key to an Account record.
@@ -150,3 +151,9 @@ friendRequests (ContactInfo roster) = do
                                $ HashMap.toList cs
         return remotes
 
+myKeyPairs :: ContactInfo -> STM [(SecretKey,PublicKey)]
+myKeyPairs (ContactInfo accounts) = do
+    acnts <- readTVar accounts
+    forM (HashMap.toList acnts) $ \(nid, Account{userSecret}) -> do
+        return (userSecret,id2key nid)
+
diff --git a/src/Network/Tox/Crypto/Handlers.hs b/src/Network/Tox/Crypto/Handlers.hs
index 95cb1bc8..9e5bd94e 100644
--- a/src/Network/Tox/Crypto/Handlers.hs
+++ b/src/Network/Tox/Crypto/Handlers.hs
@@ -543,7 +543,7 @@ cryptoNetHandler sessions addr (NetHandshake (Handshake (Cookie n24 ecookie) non
         allsessions = netCryptoSessions sessions
         anyRight [] f     = return $ Left "missing key"
         anyRight (x:xs) f = f x >>= either (const $ anyRight xs f) (return . Right)
-    seckeys <- map fst <$> atomically (readTVar (userKeys crypto))
+    seckeys <- map fst <$> atomically (userKeys crypto)
     symkey <- atomically $ transportSymmetric crypto
     now <- getPOSIXTime
     dput XNetCrypto ("Decrypt cookie with n24=" ++ show n24 ++ "\n    symkey= " ++ show symkey)
diff --git a/src/Network/Tox/Onion/Transport.hs b/src/Network/Tox/Onion/Transport.hs
index 550a7730..d604a5c8 100644
--- a/src/Network/Tox/Onion/Transport.hs
+++ b/src/Network/Tox/Onion/Transport.hs
@@ -848,7 +848,7 @@ instance Read AnnouncedRendezvous where
 selectAlias :: TransportCrypto -> NodeId -> STM AliasSelector
 selectAlias crypto pkey = do
         ks <- filter (\(sk,pk) -> pk == id2key pkey)
-                                <$> readTVar (userKeys crypto)
+                                <$> userKeys crypto
         maybe (return SearchingAlias)
               (return . uncurry AnnouncingAlias)
               (listToMaybe ks)
@@ -859,7 +859,7 @@ parseDataToRoute
          -> (OnionMessage Encrypted,OnionDestination r)
          -> IO (Either ((PublicKey,OnionData),AnnouncedRendezvous) (OnionMessage Encrypted, OnionDestination r))
 parseDataToRoute crypto (OnionToRouteResponse dta, od) = do
-  ks <- atomically $ readTVar $ userKeys crypto
+  ks <- atomically $ userKeys crypto
 
   omsg0 <- decryptMessage crypto (rendezvousSecret crypto,rendezvousPublic crypto)
                                 (asymmNonce dta)