1 files changed, 10 insertions, 4 deletions

diff --git a/DHTHandlers.hs b/DHTHandlers.hs
index 437b05f3..7ff7a3ce 100644
--- a/DHTHandlers.hs
+++ b/DHTHandlers.hs
@@ -26,6 +26,7 @@ import Data.IP
 import Data.Ord
 import Data.Maybe
 import Data.Bits
+import System.IO
 
 data TransactionId = TransactionId
  { transactionKey :: Nonce8  -- ^ Used to lookup pending query.
@@ -95,8 +96,9 @@ prefer4or6 addr iptyp = fromMaybe (ipFamily $ nodeIP addr) iptyp
 toxSpace :: R.KademliaSpace NodeId NodeInfo
 toxSpace = R.KademliaSpace
     { R.kademliaLocation = nodeId
-    , R.kademliaTestBit  = testIdBit
-    , R.kademliaXor      = xor
+    , R.kademliaTestBit  = testNodeIdBit
+    , R.kademliaXor      = xorNodeId
+    , R.kademliaSample   = sampleNodeId
     }
 
 
@@ -133,7 +135,7 @@ type Client = QR.Client String PacketKind TransactionId NodeInfo Message
 
 wrapAssym :: TransactionId -> NodeInfo -> NodeInfo -> (Nonce8 -> dta) -> Assym dta
 wrapAssym (TransactionId n8 n24) src dst dta = Assym
-    { senderKey = let NodeId pubkey = nodeId src in pubkey
+    { senderKey = id2key $ nodeId src
     , assymNonce = n24
     , assymData = dta n8
     }
@@ -158,7 +160,9 @@ unpong _               = Nothing
 
 ping :: Client -> NodeInfo -> IO Bool
 ping client addr = do
+    hPutStrLn stderr $ show addr ++ " <-- ping"
     reply <- QR.sendQuery client (serializer PingType DHTPing unpong) Ping addr
+    hPutStrLn stderr $ show addr ++ " -pong-> " ++ show reply
     maybe (return False) (\Pong -> return True) $ join reply
 
 unsendNodes :: Message -> Maybe (Assym (Nonce8,SendNodes))
@@ -170,12 +174,14 @@ unwrapNodes (SendNodes ns) = (ns,ns,())
 
 getNodes :: Client -> NodeId -> NodeInfo -> IO (Maybe ([NodeInfo],[NodeInfo],()))
 getNodes client nid addr = do
+    hPutStrLn stderr $ show addr ++ " <-- getnodes " ++ show nid
     reply <- QR.sendQuery client (serializer GetNodesType DHTGetNodes unsendNodes) (GetNodes nid) addr
+    hPutStrLn stderr $ show addr ++ " -sendnodes-> " ++ show reply
     return $ fmap unwrapNodes $ join reply
 
 updateRouting :: Client -> Routing -> NodeInfo -> Message -> IO ()
 updateRouting client routing naddr msg = do
-    -- hPutStrLn stderr $ "updateRouting "++show typ
+    hPutStrLn stderr $ "updateRouting "++show (fst $ dhtMessageType $ fst $ DHTTransport.encrypt (error "updateRouting") msg naddr )
     -- TODO: check msg type
     case prefer4or6 naddr Nothing of
         Want_IP4 -> updateTable client naddr (routing4 routing) (committee4 routing) (sched4 routing)