3 files changed, 30 insertions, 10 deletions

diff --git a/src/Network/BitTorrent.hs b/src/Network/BitTorrent.hs
index b9dc39eb..546c7644 100644
--- a/src/Network/BitTorrent.hs
+++ b/src/Network/BitTorrent.hs
@@ -12,7 +12,7 @@ module Network.BitTorrent
 
          -- * Session
        , ClientSession
-       , newClient
+       , newClient, defaultClient
 
        , SwarmSession
        , newLeacher, newSeeder
@@ -27,6 +27,8 @@ module Network.BitTorrent
        , Block(..), BlockIx(..), ppBlock, ppBlockIx
 
        , awaitEvent, yieldEvent
+
+       , Extension, defaultExtensions, ppExtension
        ) where
 
 import Control.Concurrent
@@ -41,7 +43,11 @@ import Network.BitTorrent.Internal
 import Network.BitTorrent.Exchange
 import Network.BitTorrent.Exchange.Protocol
 import Network.BitTorrent.Tracker
+import Network.BitTorrent.Extension
+
 
+defaultClient :: IO ClientSession
+defaultClient = newClient defaultThreadCount defaultExtensions
 
 -- discover should hide tracker and DHT communication under the hood
 -- thus we can obtain an unified interface
diff --git a/src/Network/BitTorrent/Extension.hs b/src/Network/BitTorrent/Extension.hs
index 13a30581..a498bc19 100644
--- a/src/Network/BitTorrent/Extension.hs
+++ b/src/Network/BitTorrent/Extension.hs
@@ -12,8 +12,15 @@
 --
 {-# LANGUAGE OverloadedStrings #-}
 module Network.BitTorrent.Extension
-       ( Capabilities,  ppCaps, defaultCaps, enabledCaps
-       , Extension(..), ppExtension, encodeExts, decodeExts
+       ( -- * Capabilities
+         Capabilities
+       , ppCaps, defaultCaps
+       , enabledCaps
+
+         -- * Extensions
+       , Extension(..)
+       , defaultExtensions, ppExtension
+       , encodeExts, decodeExts
        ) where
 
 import Data.Bits
@@ -35,7 +42,6 @@ enabledCaps :: Capabilities -- ^ of the client.
 enabledCaps = (.&.)
 
 
-
 data Extension = ExtDHT  -- ^ BEP 5
                | ExtFast -- ^ BEP 6
                  deriving (Show, Eq, Ord, Enum, Bounded)
@@ -48,6 +54,8 @@ extensionMask :: Extension -> Word64
 extensionMask ExtDHT  = 0x01
 extensionMask ExtFast = 0x04
 
+defaultExtensions :: [Extension]
+defaultExtensions = []
 
 encodeExts :: [Extension] -> Capabilities
 encodeExts = foldr (.&.) 0 . map extensionMask
diff --git a/src/Network/BitTorrent/Internal.hs b/src/Network/BitTorrent/Internal.hs
index 2fadd9ce..afe1fff1 100644
--- a/src/Network/BitTorrent/Internal.hs
+++ b/src/Network/BitTorrent/Internal.hs
@@ -28,6 +28,8 @@ module Network.BitTorrent.Internal
        , ClientSession (clientPeerID, allowedExtensions)
        , newClient, getCurrentProgress
 
+       , ThreadCount, defaultThreadCount
+
          -- * Swarm
        , SwarmSession(SwarmSession, torrentMeta, clientSession)
        , newLeacher, newSeeder
@@ -109,6 +111,9 @@ startProgress = Progress 0 0
 
 type ThreadCount = Int
 
+defaultThreadCount :: ThreadCount
+defaultThreadCount = 1000
+
 -- | In one application we could have many clients with difference
 -- ID's and different enabled extensions.
 data ClientSession = ClientSession {
@@ -166,6 +171,13 @@ newClient n exts = do
 
 type SessionCount = Int
 
+defSeederConns :: SessionCount
+defSeederConns = defaultUnchokeSlots
+
+defLeacherConns :: SessionCount
+defLeacherConns = defaultNumWant
+
+
 -- | Extensions are set globally by
 --   Swarm session are un
 data SwarmSession = SwarmSession {
@@ -204,12 +216,6 @@ newLeacher :: ClientSession -> Torrent -> IO SwarmSession
 newLeacher cs t @ Torrent {..}
   = newSwarmSession defLeacherConns (haveNone (pieceCount tInfo)) cs t
 
-defSeederConns :: SessionCount
-defSeederConns = defaultUnchokeSlots
-
-defLeacherConns :: SessionCount
-defLeacherConns = defaultNumWant
-
 --isLeacher :: SwarmSession -> IO Bool
 --isLeacher = undefined