1 files changed, 20 insertions, 2 deletions

diff --git a/src/Network/BitTorrent/DHT/Session.hs b/src/Network/BitTorrent/DHT/Session.hs
index bc9fda91..c08021c7 100644
--- a/src/Network/BitTorrent/DHT/Session.hs
+++ b/src/Network/BitTorrent/DHT/Session.hs
@@ -54,14 +54,16 @@ module Network.BitTorrent.DHT.Session
          -- ** Routing table
        , getTable
        , getClosest
-       , getSwarms
-       , allPeers
 
          -- ** Peer storage
        , insertPeer
        , getPeerList
        , insertTopic
        , deleteTopic
+       , getSwarms
+       , savePeerStore
+       , mergeSavedPeers
+       , allPeers
 
          -- ** Messaging
        , queryParallel
@@ -84,6 +86,7 @@ import Data.Fixed
 import Data.Hashable
 import Data.List as L
 import Data.Maybe
+import Data.Monoid
 import Data.Set as S
 import Data.Time
 import Network (PortNumber)
@@ -91,6 +94,7 @@ import System.Random (randomIO)
 import Data.Time.Clock.POSIX
 import Data.Text as Text
 import Text.PrettyPrint.HughesPJClass hiding ((<>),($$))
+import Data.Serialize as S
 
 
 import Data.Torrent as Torrent
@@ -409,6 +413,20 @@ getSwarms = do
     store <- asks contactInfo >>= liftIO . atomically . readTVar
     return $ P.knownSwarms store
 
+savePeerStore :: (Ord ip, Address ip) => DHT ip ByteString
+savePeerStore = do
+    var <- asks contactInfo
+    peers <- liftIO $ atomically $ readTVar var
+    return $ S.encode peers
+
+mergeSavedPeers :: (Ord ip, Address ip) => ByteString -> DHT ip ()
+mergeSavedPeers bs = do
+    var <- asks contactInfo
+    case S.decode bs of
+        Right newbies -> liftIO $ atomically $ modifyTVar' var (<> newbies)
+        Left _        -> return ()
+
+
 allPeers :: Ord ip => InfoHash -> DHT ip [ PeerAddr ip ]
 allPeers ih = do
     store <- asks contactInfo >>= liftIO . atomically . readTVar