3 files changed, 10 insertions, 3 deletions

diff --git a/bittorrent.cabal b/bittorrent.cabal
index 2dee30ee..b3165137 100644
--- a/bittorrent.cabal
+++ b/bittorrent.cabal
@@ -362,6 +362,7 @@ executable dhtd
                      , data-default
                      , monad-logger
                      , bittorrent
+                     , unix
 
 -- Utility to work with torrent files.
 executable mktorrent
diff --git a/examples/dhtd.hs b/examples/dhtd.hs
index 19b45acb..4afceb50 100644
--- a/examples/dhtd.hs
+++ b/examples/dhtd.hs
@@ -24,6 +24,7 @@ import System.IO.Error
 import Text.PrettyPrint.HughesPJClass
 import Text.Printf
 import Control.Monad.Reader.Class
+import System.Posix.Process (getProcessID)
 
 import Network.BitTorrent.Address
 import Network.BitTorrent.DHT
@@ -153,12 +154,16 @@ clientSession st signalQuit sock n h = do
                     return $ do
                     hPutClient h $ showReport r
 
-        ("peers ", s) -> cmd $ do
+        ("peers", s) -> cmd $ do
                     let ih = fromString s
                     ps <- allPeers ih
                     return $ do
                     hPutClient h $ showReport $ map (((,) "") . show . pPrint) ps
 
+        ("pid", _) -> cmd $ return $ do
+                    pid <- getProcessID
+                    hPutClient h (show pid)
+
         _    -> cmd0 $ hPutClient h "error."
 
 main :: IO ()
diff --git a/src/Network/BitTorrent/DHT/Session.hs b/src/Network/BitTorrent/DHT/Session.hs
index c08021c7..8dc3f7ac 100644
--- a/src/Network/BitTorrent/DHT/Session.hs
+++ b/src/Network/BitTorrent/DHT/Session.hs
@@ -395,8 +395,9 @@ routableAddress = do
 myNodeIdAccordingTo :: NodeAddr ip -> DHT ip NodeId
 myNodeIdAccordingTo _ = do
   info <- asks routingInfo >>= liftIO . atomically . readTVar
-  fallback <- asks tentativeNodeId
-  return $ maybe fallback myNodeId info
+  maybe (asks tentativeNodeId)
+        (return . myNodeId)
+        info
 
 -- | Get current routing table. Normally you don't need to use this
 -- function, but it can be usefull for debugging and profiling purposes.