1 files changed, 22 insertions, 2 deletions

diff --git a/src/Network/Tox.hs b/src/Network/Tox.hs
index eb4c6027..c0e1dee0 100644
--- a/src/Network/Tox.hs
+++ b/src/Network/Tox.hs
@@ -196,7 +196,7 @@ newClient drg net classify selfAddr handlers modifytbl modifynet = do
         mkclient (tbl,var) handlers =
             let client = Client
                     { clientNet           = addHandler eprinter (handleMessage client) $ modifynet client net
-                    , clientDispatcher    = dispatch tbl var handlers -- (fmap (contramapAddr (\(ToxPath ni _) -> ni)) . handlers)
+                    , clientDispatcher    = dispatch tbl var handlers
                     , clientErrorReporter = eprinter { reportTimeout = reportTimeout ignoreErrors }
                     , clientPending       = var
                     , clientAddress       = selfAddr
@@ -208,7 +208,7 @@ newClient drg net classify selfAddr handlers modifytbl modifynet = do
 data Tox = Tox
     { toxDHT :: DHT.Client
     , toxOnion :: Onion.Client RouteId
-    , toxToRoute :: Transport String Onion.Rendezvous Onion.DataToRoute
+    , toxToRoute :: Transport String Onion.AnnouncedRendezvous (PublicKey,Onion.OnionData)
     , toxCrypto :: Transport String SockAddr NetCrypto
     , toxCryptoKeys :: TransportCrypto
     , toxRouting :: DHT.Routing
@@ -217,6 +217,26 @@ data Tox = Tox
     , toxOnionRoutes :: OnionRouter
     }
 
+getContactInfo :: Tox -> IO DHT.DHTPublicKey
+getContactInfo Tox{toxCryptoKeys,toxRouting} = join $ atomically $ do
+    r4 <- readTVar $ DHT.routing4 toxRouting
+    r6 <- readTVar $ DHT.routing6 toxRouting
+    nonce <- transportNewNonce toxCryptoKeys
+    let self = nodeId n4
+        n4 = R.thisNode r4
+        n6 = R.thisNode r6
+        n4s = R.kclosest DHT.toxSpace 4 self r4
+        n6s = R.kclosest DHT.toxSpace 4 self r6
+        ns = filter (DHT.isGlobal . nodeIP) [n4,n6]
+              ++ concat (zipWith (\a b -> [a,b]) n4s n6s)
+    return $ do
+    timestamp <- round . (* 1000000) <$> getPOSIXTime
+    return DHT.DHTPublicKey
+        { dhtpkNonce = timestamp
+        , dhtpk      = id2key self
+        , dhtpkNodes = DHT.SendNodes $ take 4 ns
+        }
+
 isLocalHost :: SockAddr -> Bool
 isLocalHost (SockAddrInet _ host32) = (fromBE32 host32 == 0x7f000001)
 isLocalHost _                       = False