2 files changed, 19 insertions, 9 deletions

diff --git a/src/Network/BitTorrent/Client.hs b/src/Network/BitTorrent/Client.hs
index bd4993ba..fce8cfe2 100644
--- a/src/Network/BitTorrent/Client.hs
+++ b/src/Network/BitTorrent/Client.hs
@@ -84,7 +84,11 @@ exchangeOptions pid Options {..} = Exchange.Options
   }
 
 connHandler :: MVar (HashMap InfoHash Handle) -> Exchange.Handler
-connHandler _tmap = undefined
+connHandler tmap ih = do
+  m <- readMVar tmap
+  case HM.lookup ih m of
+    Nothing            -> error "torrent not found"
+    Just (Handle {..}) -> return exchange
 
 initClient :: Options -> LogFun -> ResIO Client
 initClient opts @ Options {..} logFun = do
diff --git a/src/Network/BitTorrent/Exchange/Manager.hs b/src/Network/BitTorrent/Exchange/Manager.hs
index 1ea9989f..52a51a8d 100644
--- a/src/Network/BitTorrent/Exchange/Manager.hs
+++ b/src/Network/BitTorrent/Exchange/Manager.hs
@@ -12,8 +12,10 @@ import Control.Monad
 import Data.Default
 import Network.Socket
 
+import Data.Torrent.InfoHash
 import Network.BitTorrent.Core
-
+import Network.BitTorrent.Exchange.Session
+import Network.BitTorrent.Exchange.Wire hiding (Options)
 
 data Options = Options
   { optBacklog  :: Int
@@ -30,7 +32,13 @@ data Manager = Manager
   { listener :: !ThreadId
   }
 
-type Handler = Socket -> PeerAddr IP -> IO ()
+type Handler = InfoHash -> IO Session
+
+handleNewConn :: Socket -> PeerAddr IP -> Handler -> IO ()
+handleNewConn sock addr handler = do
+  conn <- newPendingConnection sock addr
+  ses  <- handler (pendingTopic conn) `onException` closePending conn
+  attach conn ses
 
 listenIncoming :: Options -> Handler -> IO ()
 listenIncoming Options {..} handler = do
@@ -38,12 +46,10 @@ listenIncoming Options {..} handler = do
     bind sock (toSockAddr optPeerAddr)
     listen sock optBacklog
     forever $ do
-      (conn, addr) <- accept sock
-      case fromSockAddr addr of
-        Nothing    -> return ()
-        Just paddr -> do
-          forkIO $ handler conn paddr
-          return ()
+      (conn, sockAddr) <- accept sock
+      case fromSockAddr sockAddr of
+        Nothing   -> return ()
+        Just addr -> void $ forkIO $ handleNewConn sock addr handler
 
 newManager :: Options -> Handler -> IO Manager
 newManager opts handler = do