From 41b1a490c7b516c0feb0251fdb7723f045773f23 Mon Sep 17 00:00:00 2001 From: Joe Crayne Date: Sat, 25 Jan 2020 04:33:07 -0500 Subject: Establish TCP link when sending OOB packet. --- dht/src/Network/Tox.hs | 1 + dht/src/Network/Tox/TCP.hs | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dht/src/Network/Tox.hs b/dht/src/Network/Tox.hs index e0704f6f..6adfb9a9 100644 --- a/dht/src/Network/Tox.hs +++ b/dht/src/Network/Tox.hs @@ -449,6 +449,7 @@ dnssdDiscover tox ni toxid = do void $ DHT.pingUDP (toxDHT tox) ni -- | Log a dbus error +putDBusError :: Bool -> String -> IO () putDBusError bFatal msg = do let fatality = if bFatal then "Fatal" else "Non-Fatal" prefix = fatality <> " DBus Exception: " diff --git a/dht/src/Network/Tox/TCP.hs b/dht/src/Network/Tox/TCP.hs index 27a0f3d6..a89dbced 100644 --- a/dht/src/Network/Tox/TCP.hs +++ b/dht/src/Network/Tox/TCP.hs @@ -454,7 +454,7 @@ partitionRelay tr = partitionTransportM parse encode tr encode :: (ByteString, ViaRelay) -> IO (Maybe ((Bool,RelayPacket), NodeInfo)) encode (bs, ViaRelay (Just conid) _ ni) = return $ Just ((False,RelayData bs conid), ni) - encode (bs, ViaRelay Nothing nid ni) = return $ Just ((False,OOBSend (UDP.id2key nid) bs), ni) + encode (bs, ViaRelay Nothing nid ni) = return $ Just ((True,OOBSend (UDP.id2key nid) bs), ni) partitionOnion :: TransportCrypto -- cgit v1.2.3