1 files changed, 7 insertions, 5 deletions

diff --git a/src/Network/Address.hs b/src/Network/Address.hs
index 9a601dcd..4f163b79 100644
--- a/src/Network/Address.hs
+++ b/src/Network/Address.hs
@@ -126,6 +126,7 @@ import Text.PrettyPrint.HughesPJClass hiding ((<>),($$))
 import System.Locale    (defaultTimeLocale)
 #endif
 import System.Entropy
+import System.IO (stderr)
 
 -- import Paths_bittorrent (version)
 
@@ -1168,14 +1169,14 @@ fingerprint pid = either (const def) id $ runGet getCI (getPeerId pid)
 -- function will return a SockAddr to bind to.  If the input
 -- is not understood as a port number, zero will be set in order
 -- to ask the system for an unused port.
---
--- TODO: Also interpret local ip address specifications in the input
--- string.
 getBindAddress :: String -> Bool -> IO SockAddr
-getBindAddress listenPortString enabled6 = do
+getBindAddress bindspec enabled6 = do
+    let (host,listenPortString) = case L.break (==':') (L.reverse bindspec) of
+            (rport,':':rhost) -> (Just $ L.reverse rhost, L.reverse rport)
+            _                 -> (Nothing, bindspec)
     -- Bind addresses for localhost
     xs <- getAddrInfo (Just (defaultHints {addrFlags = [AI_PASSIVE] }))
-                      Nothing
+                      host
                       (Just listenPortString)
             `onException` return []
     -- We prefer IPv6 because that can also handle connections from IPv4
@@ -1188,6 +1189,7 @@ getBindAddress listenPortString enabled6 = do
                   then SockAddrInet6 (parsePort listenPortString) 0 iN6ADDR_ANY 0
                   else SockAddrInet (parsePort listenPortString) iNADDR_ANY
                     where parsePort s = fromMaybe 0 $ readMaybe s
+    hPutStrLn stderr $ BS8.pack $ "Listening on " ++ show listenAddr
     return listenAddr
 
 -- | True if the argument is an IPv4-mapped address with prefix ::FFFF:0:0/96