1 files changed, 6 insertions, 4 deletions

diff --git a/dht/ToxManager.hs b/dht/ToxManager.hs
index ab73b327..00e7146b 100644
--- a/dht/ToxManager.hs
+++ b/dht/ToxManager.hs
@@ -17,6 +17,7 @@ import Control.Monad
 import Crypto.Tox
 import Data.Bits
 import qualified Data.ByteArray              as BA
+import Data.Dependent.Sum
 import Data.Function
 import qualified Data.HashMap.Strict         as HashMap
 import Data.List
@@ -27,6 +28,7 @@ import qualified Data.Set                    as Set
 import qualified Data.Text                   as T
          ;import Data.Text                   (Text)
 import Data.Time.Clock.POSIX
+import qualified Data.Tox.DHT.Multi          as Multi
 import Data.Word
 import DPut
 import DebugTag
@@ -341,7 +343,7 @@ gotDhtPubkey theirDhtKey tx theirKey = do
     showak :: AnnounceKey -> String
     showak k = unpackAnnounceKey (txAnnouncer tx) k
 
-    assume :: AnnounceKey -> POSIXTime -> SockAddr -> NodeInfo -> STM ()
+    assume :: Show infosource => AnnounceKey -> POSIXTime -> infosource -> NodeInfo -> STM ()
     assume akey time addr ni =
       tput XNodeinfoSearch $ show ("rumor", showak akey, time, addr, ni)
 
@@ -419,9 +421,9 @@ getCookie tx theirKey theirDhtKey ni isActive getC ann akey now = getCookieAgain
 
     callRealShakeHands cookie = do
             forM_ (nodeInfo (key2id $ dhtpk theirDhtKey) (nodeAddr ni)) $ \ni' -> do
-            hs <- cacheHandshake hscache (userSecret (txAccount tx)) theirKey ni' cookie
+            hs <- cacheHandshake hscache (userSecret (txAccount tx)) theirKey (Multi.UDP ==> ni') cookie
             dput XNetCrypto $  show addr ++ "<-- handshake " ++ show (key2id theirKey)
-            sendMessage (toxHandshakes $ txTox tx) (nodeAddr ni) hs
+            sendMessage (toxHandshakes $ txTox tx) (Multi.SessionUDP ==> nodeAddr ni) hs
 
     reschedule n f = scheduleRel ann akey f n
     reschedule' n f = reschedule n (ScheduledItem $ \_ _ now -> f now)
@@ -433,7 +435,7 @@ getCookie tx theirKey theirDhtKey ni isActive getC ann akey now = getCookieAgain
           dput XNetCrypto $ show addr ++ " <-- request cookie"
           let pending flag = setPendingCookie hscache myPublicKey theirKey flag
           atomically $ pending True
-          cookieRequest (toxCryptoKeys $ txTox tx) (toxDHT $ txTox tx) myPublicKey ni >>= \case
+          cookieRequest (toxCryptoKeys $ txTox tx) (toxDHT $ txTox tx) myPublicKey (Multi.UDP ==> ni) >>= \case
             Nothing -> atomically $ do
                         pending False
                         reschedule' 5 (const getCookieAgain)