1 files changed, 12 insertions, 8 deletions

diff --git a/src/Network/Tox.hs b/src/Network/Tox.hs
index c0e1dee0..93e3c663 100644
--- a/src/Network/Tox.hs
+++ b/src/Network/Tox.hs
@@ -86,16 +86,17 @@ import Network.BitTorrent.DHT.Token           as Token
 import GHC.TypeLits
 
 import Crypto.Tox
-import Network.Tox.Transport
+import Data.Word64Map                        (fitsInInt)
+import Network.Tox.Crypto.Transport          (NetCrypto)
+import qualified Network.Tox.DHT.Handlers    as DHT
+import qualified Network.Tox.DHT.Transport   as DHT
 import Network.Tox.NodeId
-import qualified Network.Tox.DHT.Transport as DHT
-import qualified Network.Tox.DHT.Handlers as DHT
+import qualified Network.Tox.Onion.Handlers  as Onion
 import qualified Network.Tox.Onion.Transport as Onion
-import qualified Network.Tox.Onion.Handlers as Onion
-import Network.Tox.Crypto.Transport (NetCrypto)
-import Text.XXD
+import Network.Tox.Transport
 import OnionRouter
-import Data.Word64Map (fitsInInt)
+import Roster
+import Text.XXD
 
 newCrypto :: IO TransportCrypto
 newCrypto = do
@@ -215,6 +216,7 @@ data Tox = Tox
     , toxTokens :: TVar SessionTokens
     , toxAnnouncedKeys :: TVar Onion.AnnouncedKeys
     , toxOnionRoutes :: OnionRouter
+    , toxRoster :: Roster
     }
 
 getContactInfo :: Tox -> IO DHT.DHTPublicKey
@@ -298,16 +300,18 @@ newTox keydb addr = do
                     (hookQueries orouter DHT.transactionKey)
                     (const id)
 
+    roster <- newRoster
     return Tox
         { toxDHT = dhtclient
         , toxOnion = onionclient
-        , toxToRoute = dtacrypt
+        , toxToRoute = onInbound (updateRoster roster) dtacrypt
         , toxCrypto = cryptonet
         , toxCryptoKeys = crypto
         , toxRouting = routing
         , toxTokens = toks
         , toxAnnouncedKeys = keydb
         , toxOnionRoutes = orouter
+        , toxRoster = roster
         }
 
 onionTimeout :: Tox -> DHT.TransactionId -> Onion.OnionDestination RouteId -> STM (Onion.OnionDestination RouteId, Int)