* Fixed accidental usage of TCP rather than UDP port.

* Onion: special handling for localhost addresses.

1 files changed, 24 insertions, 4 deletions

diff --git a/dht/src/Data/Tox/Onion.hs b/dht/src/Data/Tox/Onion.hs
index 0338111b..258a9f73 100644
--- a/dht/src/Data/Tox/Onion.hs
+++ b/dht/src/Data/Tox/Onion.hs
@@ -19,7 +19,7 @@
 module Data.Tox.Onion where
 
 
-import Network.Address (fromSockAddr,toSockAddr,setPort,either4or6,sockAddrPort)
+import Network.Address (fromSockAddr,toSockAddr,setPort,either4or6,sockAddrPort,localhost4,localhost6)
 import Network.QueryResponse
 import Crypto.Tox hiding (encrypt,decrypt)
 import Network.Tox.NodeId
@@ -57,6 +57,7 @@ import DebugTag
 import Data.Word64Map (fitsInInt)
 import Data.Bits (shiftR,shiftL)
 import qualified Rank2
+import Util (sameAddress)
 
 type HandleLo a = Maybe (Either String (ByteString, SockAddr)) -> IO a
 
@@ -239,11 +240,30 @@ routeId :: NodeId -> RouteId
 routeId nid = RouteId $ mod (hash nid) 12
 
 
+substituteLoopback :: SockAddr -- ^ UDP bind address
+                      -> SockAddr -- ^ Logical destination address.
+                      -> SockAddr -- ^ Destination address unless localhost, then bind address.
+substituteLoopback (SockAddrInet 0 _             ) saddr = saddr
+substituteLoopback (SockAddrInet6 _ _ (0,0,0,0) _) saddr = saddr
+substituteLoopback baddr saddr =
+    case either4or6 saddr of
+        Left s -> if sameAddress s localhost4 then baddr else saddr
+        Right s -> if sameAddress s localhost6 then baddr else saddr
 
-forwardOnions :: TransportCrypto -> UDPTransport -> (Int -> OnionMessage Encrypted -> IO ()) {- ^ TCP relay send -} -> UDPTransport
-forwardOnions crypto udp sendTCP = udp { awaitMessage = forwardAwait crypto udp sendTCP }
+handleLoopback :: SockAddr -> UDPTransport -> UDPTransport
+handleLoopback baddr udp = udp
+    { sendMessage = \a x -> sendMessage udp (substituteLoopback baddr a) x
+    }
+
+forwardOnions :: TransportCrypto
+                -> SockAddr -- UDP bind address
+                -> UDPTransport
+                -> (Int -> OnionMessage Encrypted -> IO ()) {- ^ TCP relay send -} -> UDPTransport
+forwardOnions crypto baddr udp sendTCP = udp { awaitMessage = forwardAwait crypto (handleLoopback baddr udp) sendTCP }
 
-forwardAwait :: TransportCrypto -> UDPTransport -> (Int -> OnionMessage Encrypted -> IO ()) {- ^ TCP relay send -} -> HandleLo a -> IO a
+forwardAwait :: TransportCrypto
+                -> UDPTransport
+                -> (Int -> OnionMessage Encrypted -> IO ()) {- ^ TCP relay send -} -> HandleLo a -> IO a
 forwardAwait crypto udp sendTCP kont = do
     fix $ \another -> do
       awaitMessage udp $ \case