1 files changed, 15 insertions, 8 deletions

diff --git a/src/Network/Tox/Onion/Handlers.hs b/src/Network/Tox/Onion/Handlers.hs
index 9702cbb8..047b902d 100644
--- a/src/Network/Tox/Onion/Handlers.hs
+++ b/src/Network/Tox/Onion/Handlers.hs
@@ -79,9 +79,15 @@ announceH routing toks keydb oaddr req = do
         let naddr = onionNodeInfo oaddr
         ns <- getNodesH routing naddr (GetNodes (announceSeeking req))
         tm <- getPOSIXTime
+
         let storing = case oaddr of
                         OnionToOwner _ pth -> guard (nodeId naddr == announceSeeking req) >> Just pth
                         _                  -> Nothing
+        hPutStrLn stderr $ unlines [ "announceH: nodeId          = " ++ show (nodeId naddr)
+                                   , "           announceSeeking = " ++ show (announceSeeking req)
+                                   , "           withTok         = " ++ show withTok
+                                   , "           storing         = " ++ maybe "False" (const "True") storing
+                                   ]
         record <- atomically $ do
             forM_ storing $ \retpath -> when withTok $ do
                 let toxpath = AnnouncedRoute naddr{ nodeId = announceKey req } retpath
@@ -186,7 +192,7 @@ announceSerializer getTimeout = MethodSerializer
             { -- The public key is our real long term public key if we want to
               -- announce ourselves, a temporary one if we are searching for
               -- friends.
-              senderKey = fromJust $ onionKey src -- TODO: FIXME: this should be a temporary alias key
+              senderKey = onionKey src
             , assymNonce = n24
             , assymData = Identity (req, n8)
             }
@@ -224,16 +230,15 @@ unwrapAnnounceResponse ni (AnnounceResponse is_stored (SendNodes ns))
 sendOnion :: (TransactionId -> OnionDestination r -> STM (OnionDestination r, Int))
             -> Client r
             -> AnnounceRequest
-            -> NodeInfo
+            -> OnionDestination r
             -> (NodeInfo -> AnnounceResponse -> t)
             -> IO (Maybe t)
-sendOnion getTimeout client req ni unwrap =
+sendOnion getTimeout client req oaddr unwrap =
     -- Four tries and then we tap out.
     flip fix 4 $ \loop n -> do
-    let oaddr = OnionDestination ni Nothing
     mb <- QR.sendQuery client (announceSerializer getTimeout) req oaddr
     maybe (if n>0 then loop $! n - 1 else return Nothing)
-          (return . Just . unwrap ni)
+          (return . Just . unwrap (onionNodeInfo oaddr))
           $ join mb
 
 getRendezvous :: (TransactionId -> OnionDestination r -> STM (OnionDestination r, Int))
@@ -241,8 +246,9 @@ getRendezvous :: (TransactionId -> OnionDestination r -> STM (OnionDestination r
             -> NodeId
             -> NodeInfo
             -> IO (Maybe ([NodeInfo],[Rendezvous],Maybe Nonce32))
-getRendezvous getTimeout client nid ni =
-    sendOnion getTimeout client (AnnounceRequest zeros32 nid zeroID) ni unwrapAnnounceResponse
+getRendezvous getTimeout client nid ni = do
+    let oaddr = OnionDestination SearchingAlias ni Nothing
+    sendOnion getTimeout client (AnnounceRequest zeros32 nid zeroID) oaddr unwrapAnnounceResponse
 
 putRendezvous :: (TransactionId -> OnionDestination r -> STM (OnionDestination r, Int))
                -> TransportCrypto
@@ -255,5 +261,6 @@ putRendezvous getTimeout crypto client pubkey nonce32 ni = do
     let longTermKey   = key2id pubkey
         rkey          = rendezvousPublic crypto
         rendezvousKey = key2id rkey
-    sendOnion getTimeout client (AnnounceRequest nonce32 longTermKey rendezvousKey) ni
+    let oaddr = OnionDestination (AnnouncingAlias longTermKey) ni Nothing
+    sendOnion getTimeout client (AnnounceRequest nonce32 longTermKey rendezvousKey) oaddr
         $ \ni resp -> (Rendezvous rkey ni, resp)