1 files changed, 16 insertions, 4 deletions

diff --git a/src/Network/Tox.hs b/src/Network/Tox.hs
index b22cfdf3..30efefa8 100644
--- a/src/Network/Tox.hs
+++ b/src/Network/Tox.hs
@@ -23,6 +23,7 @@ import Control.Concurrent.Lifted.Instrument
 import Control.Concurrent.Lifted
 #endif
 import Control.Concurrent.STM
+import Control.Exception                      (throwIO)
 import Control.Monad
 import Crypto.PubKey.Curve25519
 import Crypto.Random
@@ -39,11 +40,12 @@ import Data.Time.Clock.POSIX                  (getPOSIXTime)
 import Data.Word
 import Network.Socket
 import System.Endian
+import System.IO.Error
 
 import Network.BitTorrent.DHT.Token           as Token
 import qualified Data.Wrapper.PSQ             as PSQ
 import System.Global6
-import Network.Address                        (WantIP (..),IP)
+import Network.Address                        (WantIP (..),IP,getBindAddress)
 import qualified Network.Kademlia.Routing          as R
 import Network.QueryResponse
 import Crypto.Tox
@@ -209,6 +211,7 @@ data Tox extra  = Tox
     , toxOnionRoutes    :: OnionRouter
     , toxContactInfo    :: ContactInfo extra
     , toxAnnounceToLan  :: IO ()
+    , toxBindAddress    :: SockAddr
     }
 
 
@@ -268,13 +271,21 @@ getOnionAlias crypto dhtself remoteNode = atomically $ do
     return $ Onion.OnionDestination Onion.SearchingAlias alias Nothing
 
 newTox :: TVar Onion.AnnouncedKeys   -- ^ Store of announced keys we are a rendezvous for.
-       -> SockAddr                   -- ^ Bind-address to listen on.
+       -> [String]                   -- ^ Bind-address to listen on. Must provide at least one.
        -> ( ContactInfo extra -> SockAddr -> Session -> IO () )
        -> Maybe SecretKey            -- ^ Optional DHT secret key to use.
         -> ( Int -> Onion.OnionResponse Onion.N1 -> IO () ) -- ^ TCP-bound onion responses.
        -> IO (Tox extra)
-newTox keydb addr onsess suppliedDHTKey tcp = do
-    (udp,sock) <- {- addVerbosity <$> -} udpTransport' addr
+newTox keydb bindspecs onsess suppliedDHTKey tcp = 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
+            throwIO $ userError "Tox UDP listen port?"
+    (udp,sock) <- foldr tryBind failedBind addrs Nothing
+    addr <- getSocketName sock
     tox <- newToxOverTransport keydb addr onsess suppliedDHTKey udp tcp
     return tox { toxAnnounceToLan = announceToLan sock (key2id $ transportPublic $ toxCryptoKeys tox) }
 
@@ -354,6 +365,7 @@ newToxOverTransport keydb addr onNewSession suppliedDHTKey udp tcp = do
         , toxOnionRoutes    = orouter
         , toxContactInfo    = roster
         , toxAnnounceToLan  = return ()
+        , toxBindAddress    = addr
         }
 
 onionTimeout :: Tox extra -> DHT.TransactionId -> Onion.OnionDestination RouteId -> STM (Onion.OnionDestination RouteId, Int)