StreamServer: Support for fall-back bind-addresses.

2 files changed, 20 insertions, 12 deletions

diff --git a/src/Data/Tox/Relay.hs b/src/Data/Tox/Relay.hs
index 82fef126..72a05660 100644
--- a/src/Data/Tox/Relay.hs
+++ b/src/Data/Tox/Relay.hs
@@ -48,7 +48,7 @@ data RelayPacket
     | OnionPacket (OnionRequest N0)
     | OnionPacketResponse (OnionResponse N1)
     -- 0x0A through 0x0F reserved for future use.
-    | RelayData ByteString ConId -- Word8 is a connection id.  Encoded as number 16 to 255.
+    | RelayData ByteString ConId
  deriving (Eq,Ord,Show,Data)
 
 packetNumber :: RelayPacket -> Word8
diff --git a/src/Network/StreamServer.hs b/src/Network/StreamServer.hs
index afa35675..80ed4ee2 100644
--- a/src/Network/StreamServer.hs
+++ b/src/Network/StreamServer.hs
@@ -11,6 +11,7 @@ module Network.StreamServer
     , withSession
     , quitListening
     , dummyServerHandle
+    , listenSocket
     ) where
 
 import Data.Monoid
@@ -48,6 +49,8 @@ import DebugTag
 
 data ServerHandle = ServerHandle Socket (Weak ThreadId)
 
+listenSocket :: ServerHandle -> RestrictedSocket
+listenSocket (ServerHandle sock _) = restrictSocket sock
 
 -- | Create a useless do-nothing 'ServerHandle'.
 dummyServerHandle :: IO ServerHandle
@@ -97,20 +100,25 @@ withSession session = ServerConfig warnStderr session
 -- The returned handle can be used with 'quitListening' to terminate the
 -- thread and prevent any new sessions from starting.  Currently active
 -- session threads will not be terminated or signaled in any way.
-streamServer :: ServerConfig -> SockAddr -> IO ServerHandle
-streamServer cfg addr = do
+streamServer :: ServerConfig -> [SockAddr] -> IO ServerHandle
+streamServer cfg addrs = do
     let warn   = serverWarn cfg
-        family = case addr of
-                    SockAddrInet  {} -> AF_INET
-                    SockAddrInet6 {} -> AF_INET6
-                    SockAddrUnix  {} -> AF_UNIX
+        family = case addrs of
+                    SockAddrInet  {}:_ -> AF_INET
+                    SockAddrInet6 {}:_ -> AF_INET6
+                    SockAddrUnix  {}:_ -> AF_UNIX
+                    []                 -> AF_INET6
     sock <- socket family Stream 0
     setSocketOption sock ReuseAddr 1
-    fix $ \loop ->
-        tryIOError (removeSocketFile addr) >> bind sock addr
-        `catchIOError` \e -> do warn $ "bind-error: " <> bshow addr <> " " <> bshow e
-                                threadDelay 5000000
-                                loop
+    let tryBind addr next _ = do
+            tryIOError (removeSocketFile addr)
+            bind sock addr
+          `catchIOError` \e -> next (Just e)
+    fix $ \loop -> let again mbe = do
+                            forM_ mbe $ \e -> warn $ "bind-error: " <> bshow addrs <> " " <> bshow e
+                            threadDelay 5000000
+                            loop
+                    in foldr tryBind again addrs Nothing
     listen sock maxListenQueue
     thread <- mkWeakThreadId <=< forkIO $ do
         myThreadId >>= flip labelThread "StreamServer.acceptLoop"