Updated NodeToNode and NodeToClient 'networkErrorPolicy'

IntersectMBO · Jul 6, 2020 · 6382597 · 6382597
1 parent 64bf9c0
commit 6382597
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/ouroboros-network/src/Ouroboros/Network/NodeToClient.hs b/ouroboros-network/src/Ouroboros/Network/NodeToClient.hs
@@ -104,7 +104,8 @@ import           Network.Mux (WithMuxBearer (..))
 
 import           Ouroboros.Network.Codec
 import           Ouroboros.Network.Driver (TraceSendRecv(..))
-import           Ouroboros.Network.Driver.Limits (ProtocolLimitFailure)
+import           Ouroboros.Network.Driver.Simple (DecoderFailure)
+import           Ouroboros.Network.Driver.Limits (ProtocolLimitFailure (..))
 import           Ouroboros.Network.Mux
 import           Ouroboros.Network.NodeToClient.Version
 import           Ouroboros.Network.ErrorPolicy
@@ -563,8 +564,8 @@ networkErrorPolicies = ErrorPolicies
 
         -- deserialisation failure of a message from a trusted node
       , ErrorPolicy
-          $ \(_ :: CBOR.DeserialiseFailure)
-                -> Just ourBug
+         $ \(_ :: DecoderFailure CBOR.DeserialiseFailure)
+               -> Just ourBug
 
       , ErrorPolicy
           $ \(e :: MuxError)

diff --git a/ouroboros-network/src/Ouroboros/Network/NodeToNode.hs b/ouroboros-network/src/Ouroboros/Network/NodeToNode.hs
@@ -107,7 +107,8 @@ import qualified Network.Socket as Socket
 
 import           Ouroboros.Network.Codec
 import           Ouroboros.Network.Driver (TraceSendRecv(..))
-import           Ouroboros.Network.Driver.Limits (ProtocolLimitFailure)
+import           Ouroboros.Network.Driver.Simple (DecoderFailure)
+import           Ouroboros.Network.Driver.Limits (ProtocolLimitFailure (..))
 import           Ouroboros.Network.IOManager
 import           Ouroboros.Network.Mux
 import           Ouroboros.Network.NodeToNode.Version
@@ -614,8 +615,14 @@ remoteNetworkErrorPolicy = ErrorPolicies {
           -- producer, as it's likely that the other side of the connection
           -- will return grabage as well.
         , ErrorPolicy
-            $ \(_ :: CBOR.DeserialiseFailure)
-                  -> Just theyBuggyOrEvil
+           $ \(_ :: DecoderFailure CBOR.DeserialiseFailure)
+                 -> Just theyBuggyOrEvil
+
+        , ErrorPolicy
+          $ \(msg :: ProtocolLimitFailure)
+                  -> case msg of
+                      ExceededSizeLimit{} -> Just theyBuggyOrEvil
+                      ExceededTimeLimit{} -> Just (SuspendConsumer shortDelay)
 
           -- the connection was unexpectedly closed, we suspend the peer for
           -- a 'shortDelay'