3 files changed, 16 insertions, 7 deletions

diff --git a/src/Data/PacketQueue.hs b/src/Data/PacketQueue.hs
index 93f9ba14..6f997ac0 100644
--- a/src/Data/PacketQueue.hs
+++ b/src/Data/PacketQueue.hs
@@ -89,13 +89,11 @@ getMissing :: Show a => PacketQueue a -> STM [Word32]
 getMissing PacketQueue { pktq, seqno, qsize, buffend } = do
     seqno0 <- readTVar seqno
     buffend0 <- readTVar buffend
-    -- tput XNetCrypto $ "getMissing: seqno = " ++ show seqno0
-    -- tput XNetCrypto $ "getMissing: buffend0 = " ++ show buffend0
     -- note relying on fact that [ b .. a ] is null when a < b
     let indices = take (fromIntegral qsize) $ map (`mod` qsize) [ seqno0 .. buffend0 - 1]
-    -- tput XNetCrypto $ "indices: " ++ show indices
+    -- tput XNetCrypto $ "(netCRYPTO getMissing indices: " ++ show indices
     maybes <- mapM (\i -> do {x <- readArray pktq i; return (i,x)}) indices
-    -- tput XNetCrypto $ "getMissing: maybers = " ++ show maybes
+    tput XNetCrypto $ "(netCRYPTO) getMissing: (" ++ show seqno0 ++ " " ++ show buffend0 ++") => " ++ show maybes
     let nums = map fst . filter (isNothing . snd) $ maybes
     return nums
 
diff --git a/src/Network/Tox/Crypto/Handlers.hs b/src/Network/Tox/Crypto/Handlers.hs
index 82aa8f12..2e00d61b 100644
--- a/src/Network/Tox/Crypto/Handlers.hs
+++ b/src/Network/Tox/Crypto/Handlers.hs
@@ -1133,7 +1133,9 @@ sessionPacketH sessions addrRaw (CryptoPacket nonce16 encrypted) = do
                         else do dput XNetCrypto $ "enqueue ncPacketQueue Lossless " ++ show cm
                                 when (msgID cm == PING) $
                                     dput XNetCrypto $ "NetCrypto Recieved PING (session " ++ show ncSessionId ++")"
-                                when (msgID cm == PacketRequest) . atomically $ do
+                                when (msgID cm == PacketRequest) $ do
+                                     dput XNetCrypto $ "PACKETREquest: " ++ showCryptoMsg bufferEnd cm
+                                     atomically $ do
                                         num <- CB.getNextSequenceNum ncStoredRequests
                                         CB.enqueue ncStoredRequests num cd
                                 atomically $ PQ.enqueue ncPacketQueue bufferEnd cd
diff --git a/src/Network/Tox/Crypto/Transport.hs b/src/Network/Tox/Crypto/Transport.hs
index 68e3d8e1..54d96c34 100644
--- a/src/Network/Tox/Crypto/Transport.hs
+++ b/src/Network/Tox/Crypto/Transport.hs
@@ -6,7 +6,8 @@
 {-# LANGUAGE TupleSections #-}
 {-# LANGUAGE StandaloneDeriving #-}
 module Network.Tox.Crypto.Transport
-    ( parseCrypto
+    ( showCryptoMsg
+    , parseCrypto
     , encodeCrypto
     , unpadCryptoMsg
     , createRequestPacket
@@ -77,7 +78,13 @@ import Data.Text as T
 import Data.Text.Encoding as T
 import Data.Serialize as S
 import Control.Arrow
+import DPut
+import Data.PacketQueue (toPNums)
+import Data.List
 
+showCryptoMsg :: Word32 -> CryptoMessage -> [Char]
+showCryptoMsg seqno (UpToN PacketRequest bytes) =  "UpToN PacketRequest --> "  ++ show (toPNums seqno $ B.unpack bytes)
+showCryptoMsg _ msg = show msg
 
 parseCrypto :: (ByteString, SockAddr) -> Either (CryptoPacket Encrypted, SockAddr) (ByteString, SockAddr)
 parseCrypto ((B.uncons -> Just (0x1b,pkt)),saddr) = either (\_ -> Right (pkt,saddr))
@@ -96,12 +103,14 @@ encodeHandshakes :: Handshake Encrypted -> SockAddr -> (ByteString, SockAddr)
 encodeHandshakes x saddr = (B.cons 0x1a (runPut $ put x),saddr)
 
 createRequestPacket :: Word32 -> [Word32] -> CryptoMessage
-createRequestPacket seqno xs = UpToN PacketRequest (B.pack ns)
+createRequestPacket seqno xs = let r = UpToN PacketRequest (B.pack ns)
+                                   in dtrace XNetCrypto ("createRequestPacket " ++ show seqno ++ " " ++ show xs ++ " -----> " ++ show r) r
     where
         ys = Prelude.map (subtract (seqno - 1)) xs
         reduceToSums [] = []
         reduceToSums (x:xs) = x:(reduceToSums $ Prelude.map (subtract x) xs)
         makeZeroes :: Word32 -> [Word32]
+    --  makeZeroes 0 = []
         makeZeroes x
             = let (d,m)= x `divMod` 255
                   zeros= Prelude.replicate (fromIntegral d) 0