dependent-sum based CryptoMessage.

1 files changed, 9 insertions, 6 deletions

diff --git a/src/Network/Tox/Session.hs b/src/Network/Tox/Session.hs
index 18e17fb6..189967fa 100644
--- a/src/Network/Tox/Session.hs
+++ b/src/Network/Tox/Session.hs
@@ -12,13 +12,14 @@ module Network.Tox.Session
 import Control.Concurrent.STM
 import Control.Monad
 import Control.Exception
+import Data.Dependent.Sum
 import Data.Functor.Identity
 import Data.Word
 import Network.Socket         (SockAddr)
 
 import Crypto.Tox
 import Data.PacketBuffer            (PacketInboundEvent (..))
-import Data.Tox.Message
+import Data.Tox.Msg
 import DPut
 import DebugTag
 import Network.Lossless
@@ -136,10 +137,10 @@ plainHandshakeH sp saddr skey handshake = do
     forM_ m $ \(sid, t) -> do
         (t2,resend,getMissing)
             <- lossless (\cp a -> return $ fmap (,a) $ checkLossless $ runIdentity $ pktData cp)
-                        (\seqno p _ -> do
+                        (\seqno p@(Pkt m :=> _) _ -> do
                             y <- encryptPacket sk $ bookKeeping seqno p
                             return OutgoingInfo
-                                { oIsLossy         = lossyness (msgID p) == Lossy
+                                { oIsLossy         = lossyness m == Lossy
                                 , oEncoded         = y
                                 , oHandleException = Just $ \e -> do
                                         dput XUnexpected $ unlines
@@ -151,7 +152,7 @@ plainHandshakeH sp saddr skey handshake = do
                         t
         let _ = t :: TransportA String () (CryptoPacket Identity) (CryptoPacket Encrypted)
             _ = t2 :: Transport String () CryptoMessage
-        sendMessage t2 () $ OneByte ONLINE
+        sendMessage t2 () $ (Pkt ONLINE ==> ())
         spOnNewSession sp Session
             { sOurKey            = skey
             , sTheirAddr         = saddr
@@ -236,5 +237,7 @@ checkLossless cd@CryptoData{ bufferStart = ack
                            , bufferData  = x   } = tag no x' ack
  where
     x' = decodeRawCryptoMsg cd
-    tag = case lossyness (msgID x') of Lossy -> PacketReceivedLossy
-                                       _     -> PacketReceived
+    tag = case someLossyness (msgID x') of Lossy -> PacketReceivedLossy
+                                           _     -> PacketReceived
+
+