Replaced dependency (binary -> cereal) in LocalPeerCred.

1 files changed, 9 insertions, 5 deletions

diff --git a/Presence/LocalPeerCred.hs b/Presence/LocalPeerCred.hs
index c73c39df..9054f180 100644
--- a/Presence/LocalPeerCred.hs
+++ b/Presence/LocalPeerCred.hs
@@ -13,8 +13,9 @@ import System.Directory
 import Control.Arrow (first)
 import Data.Char
 import Data.Maybe
-import Data.Binary
 import Data.Bits
+import Data.Serialize
+import Data.Word
 import System.Posix.Types
 import System.Posix.Files
 import Logging
@@ -78,7 +79,7 @@ from16 = fromEnum
 as16 :: Word16 -> Word16
 as16 = id
 
-parseProcNet :: (Binary t, Num t1, Eq t, Eq t1) =>
+parseProcNet :: (Serialize t, Num t1, Eq t, Eq t1) =>
           t1
           -> t
           -> Handle
@@ -93,13 +94,16 @@ parseProcNet port host h = do
                           localaddr <- listToMaybe ys
                           let zs = L.splitWith (==':') localaddr
                           addr <- fmap parseHex $ listToMaybe zs
-                          port <- fmap (fromIntegral . as16 . decode . parseHex) $ listToMaybe $ snd (Prelude.splitAt 1 zs)
+                          port <- either (const Nothing) (Just . fromIntegral . as16) . decode . L.toStrict . parseHex
+                                  =<< listToMaybe (snd (Prelude.splitAt 1 zs))
                           let ys' = snd (Prelude.splitAt 5 (tail ys))
                               ys'' = snd (Prelude.splitAt 2 ys')
                           uid <- listToMaybe ys'
                           inode <- listToMaybe ys''
-                          let peer = (port,decode addr)
-                              user = toEnum (read (L.unpack uid) ::Int) ::UserID  -- CUid . fromIntegral $ (read (unpack uid)::Int)
+                          peer <- either (const Nothing) Just $ do
+                            a <- decode $ L.toStrict addr
+                            return (port,a)
+                          let user = toEnum (read (L.unpack uid) ::Int) ::UserID  -- CUid . fromIntegral $ (read (unpack uid)::Int)
                           return $ {-trace ("peer:"++show(peer,user,inode))-} (peer,(user,inode))
                           )
                     fmap snd . listToMaybe $ filter ((==(port,host)).fst) rs