1 files changed, 6 insertions, 7 deletions

diff --git a/dht/src/Network/Tox.hs b/dht/src/Network/Tox.hs
index 4aed1c43..270a9036 100644
--- a/dht/src/Network/Tox.hs
+++ b/dht/src/Network/Tox.hs
@@ -36,6 +36,7 @@ import qualified Data.ByteString.Char8        as C8
 import Data.Data
 import qualified Data.Dependent.Map           as DMap
 import Data.Dependent.Sum
+import Data.Functor
 import Data.Functor.Identity
 import Data.Functor.Contravariant
 import Data.Maybe
@@ -56,6 +57,7 @@ import qualified Data.Word64Map              (empty)
          ;import Data.Word64Map              (fitsInInt)
 import qualified Data.Wrapper.PSQ            as PSQ
 import Network.Address                       (IP, WantIP (..), getBindAddress)
+import Network.Bind                          as Bind
 import Network.BitTorrent.DHT.Token          as Token
 import Network.Kademlia.Bootstrap            (bootstrap, forkPollForRefresh)
 import qualified Network.Kademlia.Routing    as R
@@ -262,14 +264,11 @@ newTox :: TVar Onion.AnnouncedKeys   -- ^ Store of announced keys we are a rende
         --  ( Int -> Onion.OnionMessage Encrypted -> IO () ) -- ^ TCP-bound onion responses. XXX ignored
        -> IO (Tox extra)
 newTox keydb bindspecs onsess crypto usetcp = do
-    addrs <- mapM (`getBindAddress` True) bindspecs
-    let tryBind addr next _ = udpTransport' addr `catchIOError` (next . Just)
-        failedBind mbe = do
-            forM_ mbe $ \e -> do
-                dput XDHT $ "tox udp bind error: " ++ show addrs ++ " " ++ show e
-                throwIO e
+  msock <- Bind.udpTransport' True bindspecs
+  let failedBind = do
+            dput XDHT $ "tox udp bind error: " ++ show bindspecs
             throwIO $ userError "Tox UDP listen port?"
-    (udp,sock) <- foldr tryBind failedBind addrs Nothing
+  fromMaybe failedBind $ msock <&> \(udp,sock) -> do
     addr <- getSocketName sock
     dput XOnion $ "UDP bind address: " ++ show addr
     (relay,sendTCP) <-