1 files changed, 25 insertions, 22 deletions

diff --git a/dht/src/Network/Tox.hs b/dht/src/Network/Tox.hs
index 5d27f34f..4898513a 100644
--- a/dht/src/Network/Tox.hs
+++ b/dht/src/Network/Tox.hs
@@ -34,6 +34,7 @@ import qualified Data.ByteString              as B
          ;import Data.ByteString              (ByteString)
 import qualified Data.ByteString.Char8        as C8
 import Data.Data
+import Data.Dependent.Sum
 import Data.Functor.Identity
 import Data.Functor.Contravariant
 import Data.Maybe
@@ -45,27 +46,28 @@ import Network.Socket
 import System.Endian
 import System.IO.Error
 
+import Crypto.Tox
 import Data.TableMethods
+import qualified Data.Tox.DHT.Multi          as Multi
 import Data.Tox.Onion                        (substituteLoopback)
-import Network.Tox.RelayPinger
 import qualified Data.Word64Map
-import Network.BitTorrent.DHT.Token           as Token
-import qualified Data.Wrapper.PSQ             as PSQ
-import System.Global6
-import Network.Address                        (WantIP (..),IP,getBindAddress)
-import qualified Network.Kademlia.Routing          as R
-import Network.QueryResponse
-import Network.StreamServer                  (ServerHandle,quitListening)
-import Crypto.Tox
-import Data.Word64Map                        (fitsInInt)
 import qualified Data.Word64Map              (empty)
-import Network.Kademlia.Bootstrap            (forkPollForRefresh, bootstrap)
-import Network.Tox.Crypto.Transport          (Handshake(..),CryptoPacket)
+         ;import Data.Word64Map              (fitsInInt)
+import qualified Data.Wrapper.PSQ            as PSQ
+import Network.Address                       (IP, WantIP (..), getBindAddress)
+import Network.BitTorrent.DHT.Token          as Token
+import Network.Kademlia.Bootstrap            (bootstrap, forkPollForRefresh)
+import qualified Network.Kademlia.Routing    as R
+import Network.QueryResponse
+import Network.StreamServer                  (ServerHandle, quitListening)
+import Network.Tox.Crypto.Transport          (CryptoPacket, Handshake (..))
 import qualified Network.Tox.DHT.Handlers    as DHT
 import qualified Network.Tox.DHT.Transport   as DHT
 import Network.Tox.NodeId
 import qualified Network.Tox.Onion.Handlers  as Onion
 import qualified Network.Tox.Onion.Transport as Onion
+import Network.Tox.RelayPinger
+import System.Global6
 import Network.Tox.Transport
 import Network.Tox.TCP (tcpClient)
 import Network.Tox.Onion.Routes
@@ -117,14 +119,14 @@ nonceKey (DHT.TransactionId n _) = n
 -- | Return my own address.
 myAddr :: TVar (R.BucketList NodeInfo) -- ^ IPv4 buckets
        -> TVar (R.BucketList NodeInfo) -- ^ IPv6 buckets
-       -> Maybe NodeInfo             -- ^ Interested remote address
-       -> IO NodeInfo
+       -> Maybe Multi.NodeInfo         -- ^ Interested remote address
+       -> IO Multi.NodeInfo
 myAddr routing4 routing6 maddr = atomically $ do
     let var = case flip DHT.prefer4or6 Nothing <$> maddr of
                 Just Want_IP6 -> routing4
                 _             -> routing6
     a <- readTVar var
-    return $ R.thisNode a
+    return $ Multi.UDP ==> R.thisNode a
 
 newClient :: (DRG g, Show addr, Show meth) =>
               g -> Transport String addr x
@@ -177,8 +179,8 @@ data Tox extra  = Tox
     { toxDHT            :: DHT.Client
     , toxOnion          :: Onion.Client RouteId
     , toxToRoute        :: Transport String Onion.AnnouncedRendezvous (PublicKey,Onion.OnionData)
-    , toxCrypto         :: Transport String SockAddr (CryptoPacket Encrypted)
-    , toxHandshakes     :: Transport String SockAddr (Handshake Encrypted)
+    , toxCrypto         :: Transport String Multi.SessionAddress (CryptoPacket Encrypted)
+    , toxHandshakes     :: Transport String Multi.SessionAddress (Handshake Encrypted)
     , toxHandshakeCache :: HandshakeCache
     , toxCryptoKeys     :: TransportCrypto
     , toxRouting        :: DHT.Routing
@@ -344,17 +346,18 @@ newToxOverTransport keydb addr onNewSession (crypto,roster) udp tcp = do
     let lookupClose _ = return Nothing
 
     mkrouting <- DHT.newRouting addr crypto updateIP updateIP
-    (orouter,otbl) <- newOnionRouter crypto (dput XRoutes) (maybe False (const True) tcp)
+    (orouter,relaynet,otbl) <- newOnionRouter crypto (dput XRoutes) (maybe False (const True) tcp)
     (cryptonet,dhtcrypt,onioncrypt,dtacrypt,handshakes)
-        <- toxTransport crypto orouter lookupClose addr udp
+        <- toxTransport crypto orouter lookupClose addr udp relaynet
                 (\dst x -> sendMessage (clientNet $ tcpClient $ tcpKademliaClient orouter) dst (True,x))
                 (fromMaybe (\_ _ -> return ()) tcp)
     sessions <- initSessions (sendMessage cryptonet)
 
-    let dhtnet0 = layerTransportM (DHT.decrypt crypto nodeId) (DHT.encrypt crypto nodeId) dhtcrypt
+    let dhtnet0 = layerTransportM (DHT.decrypt crypto Multi.nodeId) (DHT.encrypt crypto Multi.nodeId) dhtcrypt
         tbl4 = DHT.routing4 $ mkrouting (error "missing client")
         tbl6 = DHT.routing6 $ mkrouting (error "missing client")
         updateOnion bkts tr = hookBucketList DHT.toxSpace bkts orouter (trampolinesUDP orouter) tr
+
     dhtclient <- newClient drg dhtnet0 DHT.classify (myAddr tbl4 tbl6) (DHT.handlers crypto . mkrouting) id
                     (\client net -> onInbound (DHT.updateRouting client (mkrouting client) updateOnion) net)
 
@@ -370,7 +373,7 @@ newToxOverTransport keydb addr onNewSession (crypto,roster) udp tcp = do
     --       This function should only initialize state.
     orouter' <- forkRouteBuilder orouter
         $ \nid ni -> fmap (\(_,ns,_)->ns)
-                     <$> DHT.getNodes dhtclient (DHT.nodesOfInterest $ mkrouting dhtclient) nid ni
+                     <$> DHT.getNodes dhtclient (DHT.nodesOfInterest $ mkrouting dhtclient) nid (Multi.UDP ==> ni)
 
     toks <- do
         nil <- nullSessionTokens
@@ -420,7 +423,7 @@ dnssdDiscover tox ni toxid = do
     forM acts $ \act ->
       atomically $ setContactAddr now (id2key tid) ni act
 
-  void $ DHT.ping (toxDHT tox) ni
+  void $ DHT.pingUDP (toxDHT tox) ni
 
 -- | Returns:
 --