2 files changed, 18 insertions, 10 deletions

diff --git a/src/Data/PacketQueue.hs b/src/Data/PacketQueue.hs
index 57845ae5..f1be1375 100644
--- a/src/Data/PacketQueue.hs
+++ b/src/Data/PacketQueue.hs
@@ -10,6 +10,7 @@ module Data.PacketQueue
     , new
     , newOverwrite
     , dequeue
+    , getMissing
     , dequeueOrGetMissing
     , markButNotDequeue
     , enqueue
@@ -99,14 +100,27 @@ observeOutOfBand PacketQueue { seqno, qsize, buffend } numberOfNextLosslessPacke
 
 -- | If seqno < buffend then return expected packet numbers for all
 --   the Nothings in the array between them.
+--   Otherwise, return empty list.
+getMissing :: PacketQueue a -> STM [Word32]
+getMissing PacketQueue { pktq, seqno, qsize, buffend } = do
+    seqno0 <- readTVar seqno
+    buffend0 <- readTVar buffend
+    -- note relying on fact that [ b .. a ] is null when a < b
+    maybes <- mapM (readArray pktq) (take (fromIntegral qsize) $ map (`mod` qsize) [ seqno0 .. buffend0 ])
+    let nums = map fst . filter (isNothing . snd) $ zip [buffend0 ..]  maybes
+    return nums
+
+-- | If seqno < buffend then return expected packet numbers for all
+--   the Nothings in the array between them.
 --   Otherwise, behave as 'dequeue' would.
+--   TODO: Do we need this function? Delete it if not.
 dequeueOrGetMissing :: PacketQueue a -> STM (Either [Word32] a)
 dequeueOrGetMissing PacketQueue { pktq, seqno, qsize, buffend } = do
     seqno0 <- readTVar seqno
     buffend0 <- readTVar buffend
     if seqno0 < buffend0
       then do
-        maybes <- mapM (readArray pktq) (take (fromIntegral qsize) $ map (`mod` qsize) [ buffend0 .. seqno0 ])
+        maybes <- mapM (readArray pktq) (take (fromIntegral qsize) $ map (`mod` qsize) [ seqno0 .. buffend0 ])
         let nums = map fst . filter (isNothing . snd) $ zip [buffend0 ..]  maybes
         return (Left nums)
       else do
diff --git a/src/Network/Tox/Crypto/Handlers.hs b/src/Network/Tox/Crypto/Handlers.hs
index ea5c0f98..356ddf24 100644
--- a/src/Network/Tox/Crypto/Handlers.hs
+++ b/src/Network/Tox/Crypto/Handlers.hs
@@ -753,15 +753,9 @@ runUponHandshake netCryptoSession0 addr pktoq = do
         labelThread tid ("NetCryptoRequest." ++ show (key2id remotePublicKey) ++ sidStr)
         fix $ \loop -> do
             atomically (readTVar (ncRequestInterval netCryptoSession0)) >>= threadDelay
-            result <- atomically $ PQ.dequeueOrGetMissing pktq
-            case result of
-                Right cd -> do
-                    dput XNetCrypto $ "Dequeued(Request Thread)::" ++ show (bufferData cd) ++ " now running hook..."
-                    _ <- runCryptoHook netCryptoSession0 (bufferData cd)
-                    return ()
-                Left nums -> do
-                    dput XNetCrypto $ "(Request Thread) Missing Packets detected:" ++ show nums
-                    dput XNetCrypto $ "TODO: compose PacketRequest message and send it."
+            nums <- atomically $ PQ.getMissing pktq
+            dput XNetCrypto $ "(Request Thread) Missing Packets detected:" ++ show nums
+            dput XNetCrypto $ "TODO: compose PacketRequest message and send it."
             loop
     dput XNetCrypto $ "runUponHandshake: " ++ show threadid ++ " = NetCryptoRequest." ++ show (key2id remotePublicKey) ++ sidStr
     -- launch dequeueOutgoing thread