Use seqence number context when serializing CryptoMessage.

2 files changed, 6 insertions, 6 deletions

diff --git a/examples/atox.hs b/examples/atox.hs
index 7845d911..3bae5203 100644
--- a/examples/atox.hs
+++ b/examples/atox.hs
@@ -92,7 +92,7 @@ data SetCmd = SetME
     deriving (Eq,Bounded,Ord,Enum,Show)
 
 forkToxInputThread myRead = forkIO $ do
-    let myconduit = Conduit.sourceHandle myRead  .| conduitGet2 (S.get :: Get CryptoMessage) -- :: ConduitT i CryptoMessage IO ()
+    let myconduit = Conduit.sourceHandle myRead  .| conduitGet2 (getCryptoMessage 0 :: Get CryptoMessage) -- :: ConduitT i CryptoMessage IO ()
     Conduit.runConduit (myconduit .| Conduit.awaitForever handle)
  where
     handle (UpToN IPC (B.uncons -> Just (ord -> toEnum -> i,arg))) = updateState i arg
@@ -113,7 +113,7 @@ forkToxInputThread myRead = forkIO $ do
                                     modifyTVar' sMap (Map.insert key view)
 
     updateState AppendMsg arg
-             = case S.decode arg of
+             = case getCryptoMessage 0 `S.runGet` arg of
                  Left str  -> puts (packUtf8 str)
                  Right msg -> liftIO . atomically $ do
                                 me <- readTVar sMe
@@ -133,7 +133,7 @@ doit myReadFd myWriteFd = do
     terminalInputLoop myWrite
 
 hSend :: MonadIO m => Handle -> CryptoMessage -> m ()
-hSend h msg = liftIO $ B.hPutStrLn h (S.encode msg)
+hSend h msg = liftIO $ B.hPutStrLn h (S.runPut $ putCryptoMessage 0 msg)
 
 terminalInputLoop myWriteH = fix $ \loop -> do
     line <- B.getLine
diff --git a/examples/dhtd.hs b/examples/dhtd.hs
index 6161fbb4..5bc2b87a 100644
--- a/examples/dhtd.hs
+++ b/examples/dhtd.hs
@@ -99,7 +99,7 @@ import qualified Network.Tox.DHT.Transport as Tox
 import qualified Network.Tox.DHT.Handlers as Tox
 import qualified Network.Tox.Onion.Transport as Tox
 import qualified Network.Tox.Onion.Handlers as Tox
-import qualified Network.Tox.Crypto.Transport as Tox (CryptoMessage(..))
+import qualified Network.Tox.Crypto.Transport as Tox (CryptoMessage(..),putCryptoMessage,getCryptoMessage)
 import qualified Network.Tox.Crypto.Handlers as Tox
 import Data.Typeable
 import Network.Tox.ContactInfo as Tox
@@ -1407,7 +1407,7 @@ netcrypto (Just (DHT {..})) (Just mypubkey) h roster (Just tox) exes paramStr =
                                              when (them /= their_pub) $ do
                                                 atomically $ writeTVar whoAreThey their_pub
                                                 B.hPutStr myWrite ("\NUL\SOH" `B.append` S.encode (Tox.key2id their_pub))
-                                             B.hPutStr myWrite (S.encode msg)
+                                             B.hPutStr myWrite (S.runPut $ Tox.putCryptoMessage 0 msg)
                                              return (Just id)
                                 addHooks currentHooks typs = forM_ typs $ \typ -> modifyTVar (Tox.ncHooks session) (Map.insert typ (currentHooks typ ++ [makeHook session typ]))
                             case ranges of
@@ -1426,7 +1426,7 @@ netcrypto (Just (DHT {..})) (Just mypubkey) h roster (Just tox) exes paramStr =
                                 tid <- myThreadId
                                 let sidStr = printf "(%x)" (Tox.ncSessionId session)
                                 labelThread tid (exekey ++ ".forward" ++ sidStr)
-                                let myconduit = Conduit.sourceHandle myRead  .| conduitGet2 S.get -- :: ConduitT i CryptoMessage IO ()
+                                let myconduit = Conduit.sourceHandle myRead  .| conduitGet2 (Tox.getCryptoMessage 0) -- :: ConduitT i CryptoMessage IO ()
                                 Conduit.runConduit (myconduit .| awaitForever (\msg -> do
                                     let typ = toWord64 (getMessageType msg)
                                     mbSendIt <- liftIO $ atomically (lookupInRangeMap typ (Tox.ncOutHooks session))