ToxManager rewrite: use aggregated netcrypto sessions.

1 files changed, 11 insertions, 0 deletions

diff --git a/src/Network/Tox.hs b/src/Network/Tox.hs
index c1cdb151..3ad2b11e 100644
--- a/src/Network/Tox.hs
+++ b/src/Network/Tox.hs
@@ -32,6 +32,7 @@ import qualified Data.ByteString              as B
 import qualified Data.ByteString.Char8        as C8
 import Data.Data
 import Data.Functor.Contravariant
+import Data.IP
 import Data.Maybe
 import qualified Data.MinMaxPSQ               as MinMaxPSQ
 import qualified Data.Serialize               as S
@@ -50,7 +51,9 @@ import Connection
 import Crypto.Tox
 import Data.Word64Map                        (fitsInInt)
 import qualified Data.Word64Map              (empty)
+import HandshakeCache
 import Network.Kademlia.Bootstrap            (forkPollForRefresh, bootstrap)
+import Network.Kademlia.Search
 import Network.Tox.Crypto.Transport          (Handshake(..),CryptoPacket)
 import Network.Tox.Handshake
 import Network.Tox.Crypto.Handlers
@@ -203,6 +206,7 @@ data Tox extra  = Tox
     , toxToRoute        :: Transport String Onion.AnnouncedRendezvous (PublicKey,Onion.OnionData)
     , toxCrypto         :: Transport String SockAddr (CryptoPacket Encrypted)
     , toxHandshakes     :: Transport String SockAddr (Handshake Encrypted)
+    , toxHandshakeCache :: HandshakeCache
     , toxCryptoSessions :: NetCryptoSessions
     , toxCryptoKeys     :: TransportCrypto
     , toxRouting        :: DHT.Routing
@@ -442,6 +446,8 @@ newToxOverTransport keydb addr mbSessionsState suppliedDHTKey udp = do
     dhtclient <- newClient drg dhtnet0 DHT.classify (myAddr tbl4 tbl6) (DHT.handlers crypto . mkrouting) id
                     $ \client net -> onInbound (DHT.updateRouting client (mkrouting client) orouter) net
 
+    hscache <- newHandshakeCache crypto (sendMessage handshakes)
+
     let sessionsState = sessionsState0 { sendHandshake     = sendMessage handshakes
                                        , sendSessionPacket = sendMessage cryptonet
                                        , transportCrypto   = crypto
@@ -479,6 +485,7 @@ newToxOverTransport keydb addr mbSessionsState suppliedDHTKey udp = do
         , toxToRoute        = onInbound (updateContactInfo roster) dtacrypt
         , toxCrypto         = addHandler (dput XMisc) (sessionPacketH sessionsState) cryptonet
         , toxHandshakes     = addHandler (dput XMisc) (handshakeH     sessionsState) handshakes
+        , toxHandshakeCache = hscache
         , toxCryptoSessions = sessionsState
         , toxCryptoKeys     = crypto
         , toxRouting        = mkrouting dhtclient
@@ -550,3 +557,7 @@ announceToLan sock nid = do
     let broadcast = addrAddress broadcast_info
         bs = S.runPut $ DHT.putMessage (DHT.DHTLanDiscovery nid)
     saferSendTo sock bs broadcast
+
+toxQSearch :: Tox extra -> Search NodeId (IP, PortNumber) Nonce32 NodeInfo Onion.Rendezvous
+toxQSearch tox = Onion.toxidSearch (onionTimeout tox) (toxCryptoKeys tox) (toxOnion tox)
+