* Fixed accidental usage of TCP rather than UDP port.

* Onion: special handling for localhost addresses.

1 files changed, 9 insertions, 2 deletions

diff --git a/dht/src/Network/Tox.hs b/dht/src/Network/Tox.hs
index 69c56e24..8a952aa4 100644
--- a/dht/src/Network/Tox.hs
+++ b/dht/src/Network/Tox.hs
@@ -45,6 +45,7 @@ import System.Endian
 import System.IO.Error
 
 import Data.TableMethods
+import Data.Tox.Onion                        (substituteLoopback)
 import qualified Data.Word64Map
 import Network.BitTorrent.DHT.Token           as Token
 import qualified Data.Wrapper.PSQ             as PSQ
@@ -78,6 +79,7 @@ import Network.Tox.Relay
 import Network.SessionTransports
 import Network.Kademlia.Search
 import HandshakeCache
+import Data.ByteString.Base16 as Base16
 
 updateIP :: TVar (R.BucketList NodeInfo) -> SockAddr -> STM ()
 updateIP tblvar a = do
@@ -291,7 +293,12 @@ newTox keydb bindspecs onsess crypto tcp = do
             throwIO $ userError "Tox UDP listen port?"
     (udp,sock) <- foldr tryBind failedBind addrs Nothing
     addr <- getSocketName sock
-    (relay,sendTCP) <- tcpRelay (fst crypto) addr (\a x -> sendMessage udp a $ S.runPut $ Onion.putRequest x)
+    dput XOnion $ "UDP bind address: " ++ show addr
+    (relay,sendTCP) <- tcpRelay (fst crypto) addr $ \a x -> do
+        let bs = S.runPut $ Onion.putRequest x
+        dput XOnion $ "Sending onion(0x" ++ (C8.unpack . Base16.encode) (B.take 1 bs) ++ ") from tcp-client to " ++ show a
+        -- mapM_ (dput XOnion) (xxd2 0 bs)
+        sendMessage udp (substituteLoopback addr a) bs
     tox <- newToxOverTransport keydb addr onsess crypto udp sendTCP
     return tox { toxAnnounceToLan = announceToLan sock (key2id $ transportPublic $ toxCryptoKeys tox)
                , toxRelayServer   = Just relay
@@ -330,7 +337,7 @@ newToxOverTransport keydb addr onNewSession (crypto,roster) udp tcp = do
     mkrouting <- DHT.newRouting addr crypto updateIP updateIP
     (orouter,otbl) <- newOnionRouter crypto (dput XRoutes)
     (cryptonet,dhtcrypt,onioncrypt,dtacrypt,handshakes)
-        <- toxTransport crypto orouter lookupClose udp
+        <- toxTransport crypto orouter lookupClose addr udp
                 (\dst x -> sendMessage (clientNet $ tcpClient $ tcpKademliaClient orouter) dst (True,x))
                 tcp
     sessions <- initSessions (sendMessage cryptonet)