1 files changed, 28 insertions, 26 deletions

diff --git a/src/Network/Tox.hs b/src/Network/Tox.hs
index 018361aa..9d785f67 100644
--- a/src/Network/Tox.hs
+++ b/src/Network/Tox.hs
@@ -258,6 +258,7 @@ netCrypto tox myseckey theirpubkey = netCryptoWithBackoff 1000000 tox myseckey t
 netCryptoWithBackoff :: Int -> Tox -> SecretKey -> PublicKey -> IO [NetCryptoSession]
 netCryptoWithBackoff millisecs tox myseckey theirpubkey = do
     let mykeyAsId = key2id (toPublic myseckey)
+    -- TODO: check status of connection here:
     mbContactsVar <- fmap contacts . HashMap.lookup mykeyAsId <$> atomically (readTVar (accounts (toxContactInfo tox)))
     case mbContactsVar of
       Nothing -> do
@@ -321,32 +322,33 @@ netCryptoWithBackoff millisecs tox myseckey theirpubkey = do
                                         , hpTheirBaseNonce = error "netCrypto: Unreachable! hpTheirBaseNonce"
                                         , hpTheirSessionKeyPublic = error "netCrypto: Unreachable! hpTheirSessionKeyPublic"
                                         }
-                        myhandshake <- do
-                            n24' <- atomically $ transportNewNonce crypto
-                            dput XNetCrypto ("Handshake Nonce24: " <> show n24')
-                            newBaseNonce <- atomically $ transportNewNonce crypto
-                            mbMyhandshakeData <- newHandShakeData crypto newBaseNonce hp saddr
-                            forM mbMyhandshakeData $ \hsdata -> do
-                                state <- lookupSharedSecret crypto myseckey theirpubkey n24'
-                                return Handshake { handshakeCookie = cookie
-                                                 , handshakeNonce = n24'
-                                                 , handshakeData = encrypt state $ encodePlain hsdata
-                                                 }
-                        case myhandshake of
-                            Nothing -> hPutStrLn stderr "netCrypto: failed to create HandshakeData." >> return []
-                            Just handshake -> do
-                                sendMessage (toxCrypto tox) saddr (NetHandshake handshake)
-                                let secnum :: Double
-                                    secnum = fromIntegral millisecs / 1000000
-                                    delay = (millisecs * 5 `div` 4)
-                                if secnum < 20000000
-                                  then do
-                                    hPutStrLn stderr $ "sent handshake, now delaying " ++ show (secnum * 1.25) ++ "  second(s).."
-                                    threadDelay delay
-                                    netCryptoWithBackoff delay tox myseckey theirpubkey -- hopefully it will find an active session this time.
-                                  else do
-                                    hPutStrLn stderr "Unable to establish session..."
-                                    return []
+                        freshCryptoSession (toxCryptoSessions tox) saddr hp
+--                      myhandshake <- do
+--                          n24' <- atomically $ transportNewNonce crypto
+--                          dput XNetCrypto ("Handshake Nonce24: " <> show n24')
+--                          newBaseNonce <- atomically $ transportNewNonce crypto
+--                          mbMyhandshakeData <- newHandShakeData crypto newBaseNonce hp saddr
+--                          forM mbMyhandshakeData $ \hsdata -> do
+--                              state <- lookupSharedSecret crypto myseckey theirpubkey n24'
+--                              return Handshake { handshakeCookie = cookie
+--                                               , handshakeNonce = n24'
+--                                               , handshakeData = encrypt state $ encodePlain hsdata
+--                                               }
+--                      case myhandshake of
+--                          Nothing -> hPutStrLn stderr "netCrypto: failed to create HandshakeData." >> return []
+--                          Just handshake -> do
+--                              sendMessage (toxCrypto tox) saddr (NetHandshake handshake)
+                        let secnum :: Double
+                            secnum = fromIntegral millisecs / 1000000
+                            delay = (millisecs * 5 `div` 4)
+                        if secnum < 20000000
+                          then do
+                            hPutStrLn stderr $ "sent handshake, now delaying " ++ show (secnum * 1.25) ++ "  second(s).."
+                            threadDelay delay
+                            netCryptoWithBackoff delay tox myseckey theirpubkey -- hopefully it will find an active session this time.
+                          else do
+                            hPutStrLn stderr "Unable to establish session..."
+                            return []
 
 getContactInfo :: Tox -> IO DHT.DHTPublicKey
 getContactInfo Tox{toxCryptoKeys,toxRouting} = join $ atomically $ do