3 files changed, 24 insertions, 9 deletions

diff --git a/examples/dhtd.hs b/examples/dhtd.hs
index 37f16f02..2b0191a3 100644
--- a/examples/dhtd.hs
+++ b/examples/dhtd.hs
@@ -595,13 +595,14 @@ main = do
                                                             -- _todo :: IO Tox.AnnounceResponse
                                                             --       -> IO ([Tox.NodeInfo], [Crypto.PubKey.Curve25519.PublicKey], b0)
                                                             Tox.unwrapAnnounceResponse
-                                                                <$> Tox.announceH (Tox.toxRouting tox)
+                                                                <$> clientAddress (Tox.toxDHT tox) Nothing
+                                                                <*> Tox.announceH (Tox.toxRouting tox)
                                                                                   (Tox.toxTokens tox)
                                                                                   (Tox.toxAnnouncedKeys tox)
                                                                                   (Tox.OnionDestination ni Nothing)
                                                                                   (Tox.AnnounceRequest zeros32 nid Tox.zeroID))
                                                          show -- PublicKey
-                                                         (const Nothing)) -- TODO: show token
+                                                         (fmap show))
                                     ]
                     , dhtParseId  = readEither :: String -> Either String Tox.NodeId
                     , dhtSearches = toxSearches
diff --git a/src/Crypto/Tox.hs b/src/Crypto/Tox.hs
index 6660fc13..c8b3665f 100644
--- a/src/Crypto/Tox.hs
+++ b/src/Crypto/Tox.hs
@@ -57,6 +57,7 @@ import qualified Data.ByteArray         as BA
          ;import Data.ByteArray         as BA (ByteArrayAccess, Bytes)
 import Data.ByteString                  as B
 import qualified Data.ByteString.Base16 as Base16
+import qualified Data.ByteString.Base64 as Base64
 import qualified Data.ByteString.Char8  as C8
 import Data.Data
 import Data.Functor.Contravariant
@@ -252,6 +253,9 @@ quoted shows s = '"':shows ('"':s)
 bin2hex :: ByteArrayAccess bs => bs -> String
 bin2hex = C8.unpack . Base16.encode . BA.convert
 
+bin2base64 :: ByteArrayAccess bs => bs -> String
+bin2base64 = C8.unpack . Base64.encode . BA.convert
+
 instance Show Nonce24 where
     showsPrec d nonce = quoted (mappend $ bin2hex nonce)
 
@@ -288,7 +292,7 @@ newtype Nonce32 = Nonce32 ByteString
  deriving (Eq, Ord, ByteArrayAccess, Data)
 
 instance Show Nonce32 where
-    showsPrec d nonce = quoted (mappend $ bin2hex nonce)
+    showsPrec d nonce = mappend $ bin2base64 nonce
 
 instance Serialize Nonce32 where
     get = Nonce32 <$> getBytes 32
diff --git a/src/Network/Tox/Onion/Handlers.hs b/src/Network/Tox/Onion/Handlers.hs
index 91dd843e..167df336 100644
--- a/src/Network/Tox/Onion/Handlers.hs
+++ b/src/Network/Tox/Onion/Handlers.hs
@@ -159,9 +159,19 @@ handlers net routing toks keydb AnnounceType
     $ announceH routing toks keydb
 handlers net _ _ keydb _ = Just $ NoReply Right $ dataToRouteH keydb net
 
+
+data Rendezvous = Rendezvous
+    { rendezvousKey :: PublicKey
+    , rendezvousNode :: NodeInfo
+    }
+ deriving Eq
+
+instance Show Rendezvous where
+    show (Rendezvous k ni) = concat [show $ key2id k, ":", show ni]
+
 toxidSearch :: (TransactionId -> OnionDestination r -> STM (OnionDestination r, Int))
                -> Client r
-               -> Search NodeId (IP, PortNumber) (Maybe Nonce32) NodeInfo PublicKey
+               -> Search NodeId (IP, PortNumber) (Maybe Nonce32) NodeInfo Rendezvous
 toxidSearch getTimeout client = Search
     { searchSpace       = toxSpace
     , searchNodeAddress = nodeIP &&& nodePort
@@ -194,23 +204,23 @@ announceSerializer getTimeout = MethodSerializer
         _                              -> Nothing
     }
 
-unwrapAnnounceResponse :: AnnounceResponse -> ([NodeInfo], [PublicKey], Maybe Nonce32)
-unwrapAnnounceResponse (AnnounceResponse is_stored (SendNodes ns))
+unwrapAnnounceResponse :: NodeInfo -> AnnounceResponse -> ([NodeInfo], [Rendezvous], Maybe Nonce32)
+unwrapAnnounceResponse ni (AnnounceResponse is_stored (SendNodes ns))
     = case is_stored of
         NotStored n32    -> (ns, [],  Just n32)
-        SendBackKey k    -> (ns, [k], Nothing)
+        SendBackKey k    -> (ns, [Rendezvous k ni], Nothing)
         Acknowledged n32 -> (ns, [],  Just n32)
 
 announce :: (TransactionId -> OnionDestination r -> STM (OnionDestination r, Int))
             -> Client r
             -> NodeId
             -> NodeInfo
-            -> IO (Maybe ([NodeInfo],[PublicKey],Maybe Nonce32))
+            -> IO (Maybe ([NodeInfo],[Rendezvous],Maybe Nonce32))
 announce getTimeout client nid ni =
     -- Four tries and then we tap out.
     flip fix 4 $ \loop n -> do
     let oaddr = OnionDestination ni Nothing
     mb <- QR.sendQuery client (announceSerializer getTimeout) (AnnounceRequest zeros32 nid zeroID) oaddr
     maybe (if n>0 then loop $! n - 1 else return Nothing)
-          (return . Just . unwrapAnnounceResponse)
+          (return . Just . unwrapAnnounceResponse ni)
           $ join mb