Merge #3979

3979: Socket configuration r=coot a=coot

# Description

Fixes #3977
         
- Updated network dependency (haskell/network#491 was merged)  
- snocket: various stylistic changes       
- snocket: do not configure sockets in bind method 
- connection-manager: add a method to configure connection sockets 
- socket: added methods to configure sockets 
- Increment zfs copy fail counter
     



Co-authored-by: Marcin Szamotulski <[email protected]>

network-mux/network-mux.cabal

@@ -56,7 +56,7 @@ library
                        -- The Windows version of network-3.1.2 is missing
                        -- functions, see
                        -- https://github.com/haskell/network/issues/484
-                       network         >=3.1.2 && <3.2,
+                       network         >=3.1.2.2 && <3.2,
                        process         >=1.6 && <1.7,
                        statistics-linreg
                                        >=0.3 && <0.4,
@@ -182,7 +182,6 @@ executable cardano-ping
   import:              demo-deps
   hs-source-dirs:      tools
   main-is:             cardano-ping.hs
-  other-modules:       Linger
   build-depends:       base,
                        aeson,
                        network-mux,

network-mux/tools/cardano-ping.hs

@@ -28,7 +28,7 @@ import           Data.Maybe (fromMaybe, isNothing)
 import           Data.TDigest
 import           Data.Text (unpack)
 import           Data.Word
-import           Network.Socket (AddrInfo)
+import           Network.Socket (AddrInfo, StructLinger (..))
 import qualified Network.Socket as Socket
 import           System.Console.GetOpt
 import           System.Environment (getArgs, getProgName)
@@ -40,8 +40,6 @@ import           Network.Mux.Bearer.Socket
 import           Network.Mux.Timeout
 import           Network.Mux.Types
 
-import           Linger
-
 mainnetMagic :: Word32
 mainnetMagic = 764824073
 

ouroboros-consensus-cardano-tools/test/Main.hs

@@ -94,4 +94,4 @@ main = defaultMain tests
 -- cannot execute binary file: Exec format error
 -- ```
 --
--- 0
+-- 3

ouroboros-consensus-mock-test/test/Main.hs

@@ -22,3 +22,10 @@ tests =
   , Test.ThreadNet.PBFT.tests
   , Test.ThreadNet.Praos.tests
   ]
+
+-- Counter to address the zfs copy bug on Hydra
+-- ```
+-- cannot execute binary file: Exec format error
+-- ```
+--
+-- 3

ouroboros-network-framework/demo/connection-manager.hs

@@ -227,6 +227,7 @@ withBidirectionalConnectionManager snocket socket
           cmIPv6Address  = Nothing,
           cmAddressType  = \_ -> Just IPv4Address,
           cmSnocket      = snocket,
+          cmConfigureSocket = \_ _ -> return (),
           cmTimeWaitTimeout = timeWaitTimeout,
           cmOutboundIdleTimeout = protocolIdleTimeout,
           connectionDataFlow = const Duplex,

ouroboros-network-framework/demo/ping-pong.hs

@@ -108,6 +108,7 @@ clientPingPong pipelined =
     withIOManager $ \iomgr ->
     connectToNode
       (Snocket.localSnocket iomgr)
+      mempty
       unversionedHandshakeCodec
       noTimeLimitsHandshake
       unversionedProtocolDataCodec
@@ -146,6 +147,7 @@ serverPingPong =
     _ <- async $ cleanNetworkMutableState networkState
     withServerNode
       (Snocket.localSnocket iomgr)
+      mempty
       nullNetworkServerTracers
       networkState
       (AcceptedConnectionsLimit maxBound maxBound 0)
@@ -206,6 +208,7 @@ clientPingPong2 =
     withIOManager $ \iomgr -> do
     connectToNode
       (Snocket.localSnocket iomgr)
+      mempty
       unversionedHandshakeCodec
       noTimeLimitsHandshake
       unversionedProtocolDataCodec
@@ -257,6 +260,7 @@ serverPingPong2 =
     _ <- async $ cleanNetworkMutableState networkState
     withServerNode
       (Snocket.localSnocket iomgr)
+      mempty
       nullNetworkServerTracers
       networkState
       (AcceptedConnectionsLimit maxBound maxBound 0)

ouroboros-network-framework/ouroboros-network-framework.cabal

@@ -68,7 +68,6 @@ library
 
                        Simulation.Network.Snocket
 
-  other-modules:       Ouroboros.Network.Linger
   -- other-extensions:
   build-depends:       base            >=4.12  && <4.15
                      , async           >=2.1   && <2.3
@@ -92,7 +91,7 @@ library
                      , io-classes      >=0.1   && < 0.3
                      , monoidal-synchronisation
                                        >=0.1   && < 0.2
-                     , network         >=3.1.2 && < 3.2
+                     , network         >=3.1.2.2 && < 3.2
                      , network-mux     >=0.1   && < 0.2
                      , ouroboros-network-testing
                      , strict-stm      >=0.1   && < 0.2

ouroboros-network-framework/src/Ouroboros/Network/ConnectionManager/Core.hs

@@ -36,7 +36,7 @@ import           Control.Monad.Fix
 import           Control.Tracer (Tracer, contramap, traceWith)
 import           Data.Foldable (foldMap', traverse_)
 import           Data.Function (on)
-import           Data.Functor (void, ($>))
+import           Data.Functor (void)
 import           Data.Maybe (maybeToList)
 import           Data.Proxy (Proxy (..))
 import           Data.Typeable (Typeable)
@@ -102,6 +102,10 @@ data ConnectionManagerArguments handlerTrace socket peerAddr handle handleError
         --
         cmSnocket             :: Snocket m socket peerAddr,
 
+        -- | Socket configuration.
+        --
+        cmConfigureSocket     :: socket -> Maybe peerAddr -> m (),
+
         -- | @TCP@ will held connections in @TIME_WAIT@ state for up to two MSL
         -- (maximum segment time).  On Linux this is set to '60' seconds on
         -- other system this might be up to four minutes.
@@ -558,6 +562,7 @@ withConnectionManager ConnectionManagerArguments {
                           cmIPv6Address,
                           cmAddressType,
                           cmSnocket,
+                          cmConfigureSocket,
                           cmTimeWaitTimeout,
                           cmOutboundIdleTimeout,
                           connectionDataFlow,
@@ -1634,17 +1639,19 @@ withConnectionManager ConnectionManagerArguments {
                     )
                     $ \socket -> do
                       traceWith tracer (TrConnectionNotFound provenance peerAddr)
-                      addr <-
-                        case cmAddressType peerAddr of
-                          Nothing -> pure Nothing
-                          Just IPv4Address ->
-                               traverse_ (bind cmSnocket socket)
-                                         cmIPv4Address
-                            $> cmIPv4Address
-                          Just IPv6Address ->
-                               traverse_ (bind cmSnocket socket)
-                                         cmIPv6Address
-                            $> cmIPv6Address
+                      let addr = case cmAddressType peerAddr of
+                                   Nothing          -> Nothing
+                                   Just IPv4Address -> cmIPv4Address
+                                   Just IPv6Address -> cmIPv6Address
+                      cmConfigureSocket socket addr
+                      case cmAddressType peerAddr of
+                        Nothing -> pure ()
+                        Just IPv4Address ->
+                             traverse_ (bind cmSnocket socket)
+                                       cmIPv4Address
+                        Just IPv6Address ->
+                             traverse_ (bind cmSnocket socket)
+                                       cmIPv6Address
 
                       traceWith tracer (TrConnect addr peerAddr)
                       connect cmSnocket socket peerAddr