summaryrefslogtreecommitdiff
path: root/dht/src/Network/Tox
diff options
context:
space:
mode:
Diffstat (limited to 'dht/src/Network/Tox')
-rw-r--r--dht/src/Network/Tox/Crypto/Transport.hs2
-rw-r--r--dht/src/Network/Tox/Onion/Handlers.hs1
2 files changed, 2 insertions, 1 deletions
diff --git a/dht/src/Network/Tox/Crypto/Transport.hs b/dht/src/Network/Tox/Crypto/Transport.hs
index 127b2dac..cff4fd88 100644
--- a/dht/src/Network/Tox/Crypto/Transport.hs
+++ b/dht/src/Network/Tox/Crypto/Transport.hs
@@ -103,7 +103,7 @@ encodeCrypto (x,saddr) = Just (B.cons 0x1b (runPut $ put x),saddr)
103 103
104parseHandshakes :: ByteString -> addr -> Either String (Handshake Encrypted, addr) 104parseHandshakes :: ByteString -> addr -> Either String (Handshake Encrypted, addr)
105parseHandshakes (B.uncons -> Just (0x1a,pkt)) saddr = left ("parseHandshakes: "++) $ (,saddr) <$> runGet get pkt 105parseHandshakes (B.uncons -> Just (0x1a,pkt)) saddr = left ("parseHandshakes: "++) $ (,saddr) <$> runGet get pkt
106parseHandshakes bs _ = Left $ "parseHandshakes_: " ++ show (B.unpack $ B.take 1 bs) 106parseHandshakes bs _ = Left $ "Unhandled packet: " ++ show (B.unpack $ B.take 1 bs)
107 107
108encodeHandshakes :: Handshake Encrypted -> addr -> (ByteString, addr) 108encodeHandshakes :: Handshake Encrypted -> addr -> (ByteString, addr)
109encodeHandshakes x saddr = (B.cons 0x1a (runPut $ put x),saddr) 109encodeHandshakes x saddr = (B.cons 0x1a (runPut $ put x),saddr)
diff --git a/dht/src/Network/Tox/Onion/Handlers.hs b/dht/src/Network/Tox/Onion/Handlers.hs
index ca7d47db..bd441f06 100644
--- a/dht/src/Network/Tox/Onion/Handlers.hs
+++ b/dht/src/Network/Tox/Onion/Handlers.hs
@@ -373,6 +373,7 @@ putRendezvous getTimeout crypto client pubkey nonce32 ni = do
373 rendezvousKey = key2id rkey 373 rendezvousKey = key2id rkey
374 asel <- atomically $ selectAlias crypto longTermKey 374 asel <- atomically $ selectAlias crypto longTermKey
375 let oaddr = OnionDestination asel ni Nothing 375 let oaddr = OnionDestination asel ni Nothing
376 dput XPublish $ "putRendezvous at " ++ show ni
376 fmap resultToMaybe 377 fmap resultToMaybe
377 $ sendOnion getTimeout client (AnnounceRequest nonce32 longTermKey rendezvousKey) oaddr 378 $ sendOnion getTimeout client (AnnounceRequest nonce32 longTermKey rendezvousKey) oaddr
378 $ \ni resp -> (Rendezvous rkey ni, resp) 379 $ \ni resp -> (Rendezvous rkey ni, resp)