3 files changed, 11 insertions, 7 deletions

diff --git a/bittorrent.cabal b/bittorrent.cabal
index 02130385..88a8e50d 100644
--- a/bittorrent.cabal
+++ b/bittorrent.cabal
@@ -74,6 +74,7 @@ library
                      , conduit          >= 1.0
                      , network-conduit  >= 1.0
                      , cereal-conduit   >= 0.5
+                     , binary-conduit
 
                        -- Data
                      , array       >= 0.4
diff --git a/src/Network/BitTorrent/Exchange.hs b/src/Network/BitTorrent/Exchange.hs
index 9f119d13..b0a94853 100644
--- a/src/Network/BitTorrent/Exchange.hs
+++ b/src/Network/BitTorrent/Exchange.hs
@@ -79,7 +79,8 @@ import Control.Monad.Trans.Resource
 
 import Data.IORef
 import Data.Conduit as C
-import Data.Conduit.Cereal
+import Data.Conduit.Cereal as S
+import Data.Conduit.Serialization.Binary as B
 import Data.Conduit.Network
 import Data.Serialize as S
 import Text.PrettyPrint as PP hiding (($$))
@@ -103,10 +104,12 @@ type PeerWire = ConduitM Message Message IO
 
 runPeerWire :: Socket -> PeerWire () -> IO ()
 runPeerWire sock p2p =
-  sourceSocket sock   $=
-    conduitGet S.get  $=
-      p2p             $=
-    conduitPut S.put  $$
+  sourceSocket sock     $=
+    S.conduitGet S.get  $=
+--    B.conduitDecode     $=
+      p2p               $=
+    S.conduitPut S.put  $$
+--    B.conduitEncode     $$
   sinkSocket sock
 
 awaitMessage :: P2P Message
diff --git a/src/Network/BitTorrent/Exchange/Protocol.hs b/src/Network/BitTorrent/Exchange/Protocol.hs
index 83774f06..a285f8d2 100644
--- a/src/Network/BitTorrent/Exchange/Protocol.hs
+++ b/src/Network/BitTorrent/Exchange/Protocol.hs
@@ -435,7 +435,7 @@ instance Serialize Message where
 
 instance Binary Message where
   get = do
-    len <- undefined --getInt
+    len <- getIntB
 --    _   <- lookAhead $ ensure len
     if len == 0 then return KeepAlive
       else do
@@ -463,7 +463,7 @@ instance Binary Message where
 
     where
       getBlock :: Int -> B.Get Block
-      getBlock len = Block <$> getIntB <*> getIntB <*> B.getBytes len
+      getBlock len = Block <$> getIntB <*> getIntB <*> B.getByteString len
       {-# INLINE getBlock #-}
 
   put KeepAlive     = putIntB 0