2 files changed, 15 insertions, 5 deletions

diff --git a/examples/dhtd.hs b/examples/dhtd.hs
index 569e1d3d..337e7d0d 100644
--- a/examples/dhtd.hs
+++ b/examples/dhtd.hs
@@ -36,10 +36,12 @@ import Network.StreamServer
 import Control.Exception.Lifted as Lifted
 #ifdef THREAD_DEBUG
 import Control.Concurrent.Lifted.Instrument
+import Data.Time ()
 import Data.Time.Clock
 #else
 import Control.Concurrent
 #endif
+import System.Environment
 
 mkNodeAddr :: SockAddr -> NodeAddr IPv4
 mkNodeAddr addr = NodeAddr (fromJust $ fromSockAddr addr)
@@ -105,10 +107,10 @@ resume = do
             restore_attempt
     return saved_nodes
 
-godht :: forall b. (NodeAddr IPv4 -> NodeId -> DHT IPv4 b) -> IO b
-godht f = do
-    a <- btBindAddr "8008" False
-    dht def { optTimeout = 5 } a allNoise $ do
+godht :: String -> (NodeAddr IPv4 -> NodeId -> DHT IPv4 b) -> IO b
+godht p f = do
+    a <- btBindAddr p False
+    dht def { optTimeout = 5 } a noDebugPrints $ do
         me0 <- asks tentativeNodeId
         printReport [("tentative node-id",show $ pPrint me0)
                    ,("listen-address", show a)
@@ -184,9 +186,16 @@ clientSession st signalQuit sock n h = do
 
         _    -> cmd0 $ hPutClient h "error."
 
+defaultPort = error "TODO defaultPort"
+
 main :: IO ()
 main = do
-    godht $ \a me0 -> do
+    args <- getArgs
+    p <- case take 2 (dropWhile (/="-p") args) of
+                ["-p",port] | not ("-" `isPrefixOf` port) -> return port
+                ("-p":_)      -> error "Port not specified! (-p PORT)"
+                _             -> defaultPort
+    godht p $ \a me0 -> do
     printTable
     bs <- liftIO bootstrapNodes
             `onException`
diff --git a/src/Control/Concurrent/Lifted/Instrument.hs b/src/Control/Concurrent/Lifted/Instrument.hs
index 9ec5deef..e5ed9d5e 100644
--- a/src/Control/Concurrent/Lifted/Instrument.hs
+++ b/src/Control/Concurrent/Lifted/Instrument.hs
@@ -19,6 +19,7 @@ import Control.Exception.Lifted
 import Control.Monad.Base
 -- import Control.Monad.IO.Class
 import qualified GHC.Conc as GHC
+import Data.Time()
 import Data.Time.Clock
 
 data PerThread = PerThread