OutGoingResult now offers packet for convenience

Also, don't send anohter Online, just send duplicate packet.

1 files changed, 12 insertions, 5 deletions

diff --git a/src/Data/PacketQueue.hs b/src/Data/PacketQueue.hs
index 59b41d91..82b6f8f0 100644
--- a/src/Data/PacketQueue.hs
+++ b/src/Data/PacketQueue.hs
@@ -208,8 +208,15 @@ newOutGoing inq towire toWireIO num capacity seqstart = do
                 , pktoToWire = towire
                 }
 
-data OutGoingResult = OGSuccess | OGFull | OGEncodeFail
-    deriving (Eq,Show)
+data OutGoingResult a = OGSuccess a | OGFull | OGEncodeFail
+    deriving (Show)
+
+instance Eq (OutGoingResult a) where
+    OGSuccess _ == OGSuccess _   = True
+    OGFull == OGFull             = True
+    OGEncodeFail == OGEncodeFail = True
+    _ == _ = False
+
 
 -- | do something in IO before appending to the queue
 readyOutGoing :: PacketOutQueue extra msg wire fromwire -> IO (STM extra)
@@ -265,7 +272,7 @@ peekPacket getExtra q@(PacketOutQueue { pktoInPQ, pktoOutPQ, pktoPacketNo, pktoT
 -- | Convert a message to packet format and append it to the front of a queue
 --   used for outgoing messages. (Note that ‘front‛ usually means the higher
 --   index in this implementation.)
-tryAppendQueueOutgoing :: STM extra -> PacketOutQueue extra msg wire fromwire -> msg -> STM OutGoingResult
+tryAppendQueueOutgoing :: STM extra -> PacketOutQueue extra msg wire fromwire -> msg -> STM (OutGoingResult wire)
 tryAppendQueueOutgoing getExtra q@(PacketOutQueue { pktoInPQ, pktoOutPQ, pktoPacketNo, pktoToWireIO, pktoToWire }) msg
   = do
     be <- readTVar (buffend pktoOutPQ)
@@ -288,7 +295,7 @@ tryAppendQueueOutgoing getExtra q@(PacketOutQueue { pktoInPQ, pktoOutPQ, pktoPac
                         modifyTVar' (buffend pktoOutPQ) (+1)
                         writeTVar pktoPacketNo $! pktno'
                         writeArray (pktq pktoOutPQ) i (Just (pktno,pkt))
-                        return OGSuccess
+                        return (OGSuccess pkt)
                     -- queue is full
                     Just (n,_) -> do
                         nn <- getHighestHandledPacketPlus1 q
@@ -298,7 +305,7 @@ tryAppendQueueOutgoing getExtra q@(PacketOutQueue { pktoInPQ, pktoOutPQ, pktoPac
                             modifyTVar' (buffend pktoOutPQ) (+1)
                             writeTVar pktoPacketNo $! pktno'
                             writeArray (pktq pktoOutPQ) i (Just (pktno,pkt))
-                            return OGSuccess
+                            return (OGSuccess pkt)
                           --  uh oh this packet is still needed...
                           else return OGFull
         -- don't know how to send this message