netCryptoSessionsByKey

1 files changed, 18 insertions, 1 deletions

diff --git a/src/Network/Tox/Crypto/Handlers.hs b/src/Network/Tox/Crypto/Handlers.hs
index b92d4805..dcc63ae0 100644
--- a/src/Network/Tox/Crypto/Handlers.hs
+++ b/src/Network/Tox/Crypto/Handlers.hs
@@ -90,6 +90,7 @@ data NetCryptoSession = NCrypto { ncState         :: TVar NetCryptoSessionStatus
                                 }
 
 data NetCryptoSessions = NCSessions { netCryptoSessions :: TVar (Map.Map SockAddr NetCryptoSession)
+                                    , netCryptoSessionsByKey :: TVar (Map.Map PublicKey [NetCryptoSession])
                                     , transportCrypto :: TransportCrypto
                                     , defaultHooks :: Map.Map MessageType [NetCryptoHook]
                                     , defaultUnrecognizedHook :: MessageType -> NetCryptoHook
@@ -98,12 +99,21 @@ data NetCryptoSessions = NCSessions { netCryptoSessions :: TVar (Map.Map SockAdd
                                     , inboundQueueCapacity :: Word32
                                     }
 
+-- | initiate a netcrypto session, blocking
+netCrypto :: TransportCrypto -> NetCryptoSessions -> SecretKey -> PublicKey -> IO NetCryptoSession
+netCrypto crypto allsessions myseckey theirpubkey = do
+    -- convert public key to NodeInfo check Roster
+    -- if no session:
+    -- 1) send dht key
+    error "todo"
+
 newSessionsState :: TransportCrypto
                  -> (MessageType -> NetCryptoHook) -- ^ default hook
                  -> Map.Map MessageType [NetCryptoHook] -- ^ all hooks, can be empty to start
                  -> IO NetCryptoSessions
 newSessionsState crypto unrechook hooks = do
     x <- atomically $ newTVar Map.empty
+    x2 <- atomically $ newTVar Map.empty
     nick <- atomically $ newTVar B.empty
     status <- atomically $ newTVar Online
     statusmsg <- atomically $ newTVar B.empty
@@ -115,6 +125,7 @@ newSessionsState crypto unrechook hooks = do
     homedir <- getHomeDirectory
     svDownloadDir0 <- atomically $ newTVar (homedir </> "Downloads")
     return NCSessions { netCryptoSessions = x
+                      , netCryptoSessionsByKey = x2
                       , transportCrypto = crypto
                       , defaultHooks = hooks
                       , defaultUnrecognizedHook = unrechook
@@ -182,6 +193,7 @@ freshCryptoSession  sessions
                               }) = do
     let crypto = transportCrypto sessions
         allsessions = netCryptoSessions sessions
+        allsessionsByKey = netCryptoSessionsByKey sessions
     ncState0 <- atomically $ newTVar Accepted
     ncTheirBaseNonce0 <- atomically $ newTVar theirBaseNonce
     n24 <- atomically $ transportNewNonce crypto
@@ -233,7 +245,12 @@ freshCryptoSession  sessions
             _ <- runCryptoHook (netCryptoSession0 {ncDequeueThread=tid}) cd
             loop
     let netCryptoSession = netCryptoSession0 {ncDequeueThread=threadid}
-    atomically $ modifyTVar allsessions (Map.insert addr netCryptoSession)
+    atomically $ do
+        modifyTVar allsessions (Map.insert addr netCryptoSession)
+        byKeyResult <- readTVar allsessionsByKey >>= return . Map.lookup remotePublicKey
+        case byKeyResult of
+            Nothing -> modifyTVar allsessionsByKey (Map.insert remotePublicKey [netCryptoSession])
+            Just xs -> modifyTVar allsessionsByKey (Map.insert remotePublicKey (netCryptoSession:xs))
 
 -- | Called when we get a handshake, but there's already a session entry.
 updateCryptoSession :: NetCryptoSessions -> SockAddr -> HandshakeParams -> NetCryptoSession -> IO ()