packet request handling, finished all todo stubs (needs test)

2 files changed, 17 insertions, 5 deletions

diff --git a/src/Data/PacketQueue.hs b/src/Data/PacketQueue.hs
index 93256474..e0221f5a 100644
--- a/src/Data/PacketQueue.hs
+++ b/src/Data/PacketQueue.hs
@@ -209,10 +209,22 @@ data OutGoingResult = OGSuccess | OGFull | OGEncodeFail
 readyOutGoing :: PacketOutQueue extra msg wire fromwire -> IO (STM extra)
 readyOutGoing (PacketOutQueue {pktoToWireIO }) = pktoToWireIO
 
-getRequested :: STM extra -> PacketOutQueue extra msg wire fromwire -> Word32 -> [Word8] -> STM [Maybe (wire,Word32)]
+getRequested :: STM extra -> PacketOutQueue extra msg wire fromwire -> Word32 -> [Word8] -> STM [Maybe (Word32,wire)]
 getRequested _        _     _    [] = return []
 getRequested getExtra pktoq snum ns = do
-    error "todo getRequested"
+    let pnums = toPNums snum ns
+        indices = map toIndex pnums
+    forM indices $ \i -> readArray (pktq $ pktoOutPQ pktoq) i
+  where
+    toIndex :: Word32 -> Word32
+    toIndex = (`mod` qsize (pktoOutPQ pktoq))
+
+    toPNums :: Word32 -> [Word8] -> [Word32]
+    toPNums snum ns = reverse . snd $ foldl doOne ((snum - 1),[]) ns
+        where
+            doOne :: (Word32,[Word32]) -> Word8 -> (Word32,[Word32])
+            doOne (addend,as) 0 = (addend+255,as)
+            doOne (addend,as) x = (addend,(fromIntegral x + addend):as)
 
 peekPacket :: STM extra -> PacketOutQueue extra msg wire fromwire -> msg -> STM (Maybe (wire,Word32))
 peekPacket getExtra q@(PacketOutQueue { pktoInPQ, pktoOutPQ, pktoPacketNo, pktoToWireIO, pktoToWire }) msg
diff --git a/src/Network/Tox/Crypto/Handlers.hs b/src/Network/Tox/Crypto/Handlers.hs
index 66de618d..457171a9 100644
--- a/src/Network/Tox/Crypto/Handlers.hs
+++ b/src/Network/Tox/Crypto/Handlers.hs
@@ -1333,7 +1333,7 @@ defaultCryptoDataHooks
             ]
 
 handlePacketRequest :: NetCryptoSession -> CryptoData -> IO ()
-handlePacketRequest session (CryptoData { bufferStart=buffstart
+handlePacketRequest session (CryptoData { bufferStart=num
                                         , bufferData=cm@(msgID -> PacketRequest)
                                         }) | let getbytes (OneByte _) = []
                                                  getbytes (TwoByte _ b) = [b]
@@ -1346,8 +1346,8 @@ handlePacketRequest session (CryptoData { bufferStart=buffstart
     case mbOutQ of
         HaveHandshake pktoq -> do
             getOutGoingParam <-PQ.readyOutGoing pktoq
-            ps <- atomically $ PQ.getRequested getOutGoingParam pktoq buffstart bs
-            let resend (Just (pkt,n)) = sendSessionPacket (ncAllSessions session) addr pkt
+            ps <- atomically $ PQ.getRequested getOutGoingParam pktoq num bs
+            let resend (Just (n,pkt)) = sendSessionPacket (ncAllSessions session) addr pkt
                 resend _ = return ()
             mapM_ resend ps
         _ -> return ()