Fixed onion routes for IPv4-mapped IPv6 addresses.

2 files changed, 4 insertions, 3 deletions

diff --git a/src/Network/Tox.hs b/src/Network/Tox.hs
index 0400f14a..6f591917 100644
--- a/src/Network/Tox.hs
+++ b/src/Network/Tox.hs
@@ -301,7 +301,7 @@ newTox keydb addr mbSessionsState = do
     dhtclient <- newClient drg dhtnet0 DHT.classify (myAddr routing) (DHT.handlers crypto routing) id
                     $ \client net -> onInbound (DHT.updateRouting client routing orouter) net
 
-    orouter <- forkRouteBuilder orouter $ \nid ni -> maybe [] (\(_,ns,_)->ns) <$> DHT.getNodes dhtclient nid ni
+    orouter <- forkRouteBuilder orouter $ \nid ni -> fmap (\(_,ns,_)->ns) <$> DHT.getNodes dhtclient nid ni
 
     toks <- do
         nil <- nullSessionTokens
diff --git a/src/Network/Tox/Onion/Transport.hs b/src/Network/Tox/Onion/Transport.hs
index baadbbe8..39ea8c46 100644
--- a/src/Network/Tox/Onion/Transport.hs
+++ b/src/Network/Tox/Onion/Transport.hs
@@ -246,9 +246,10 @@ encodeOnionAddr getRoute (msg,OnionDestination _ ni (Just rid)) = do
             return ( runPut $ putRequest $ wrapForRoute msg ni route
                    , nodeAddr $ routeNodeA route)
         mapM' f x = do
+            let _ = x :: Maybe OnionRoute
             hPutStrLn stderr $ "ONION encode sending to  " ++ show ni
-            hPutStrLn stderr $ "ONION encode getRoute -> " ++ show (mapM (\y -> map ($ y) [routeNodeA,routeNodeB,routeNodeC]) x)
-            mapM f x
+            hPutStrLn stderr $ "ONION encode getRoute -> " ++ show (fmap (\y -> map ($ y) [routeNodeA,routeNodeB,routeNodeC]) x)
+            mapM f x         -- ONION encode getRoute -> Nothing
     getRoute ni rid >>= mapM' go