Skip to content
This repository has been archived by the owner on Sep 3, 2024. It is now read-only.

Fix disconnect remote endpoints on close endpoint #24

Closed
wants to merge 1 commit into from
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 28 additions & 18 deletions src/Network/Transport/InMemory/Internal.hs
Original file line number Diff line number Diff line change
Expand Up @@ -156,24 +156,34 @@ apiNewEndPoint state = handle (return . Left) $ atomically $ do
TransportError ResolveMulticastGroupUnsupported "Multicast not supported"

apiCloseEndPoint :: TVar TransportState -> EndPointAddress -> IO ()
apiCloseEndPoint state addr = atomically $ whenValidTransportState state $ \vst ->
forM_ (vst ^. localEndPointAt addr) $ \lep -> do
old <- swapTVar (localEndPointState lep) LocalEndPointClosed
case old of
LocalEndPointClosed -> return ()
LocalEndPointValid lepvst -> do
forM_ (Map.elems (lepvst ^. connections)) $ \lconn -> do
st <- swapTVar (localConnectionState lconn) LocalConnectionClosed
case st of
LocalConnectionClosed -> return ()
LocalConnectionFailed -> return ()
_ -> forM_ (vst ^. localEndPointAt (localConnectionRemoteAddress lconn)) $ \thep ->
whenValidLocalEndPointState thep $ \_ -> do
writeTChan (localEndPointChannel thep)
(ConnectionClosed (localConnectionId lconn))
writeTChan (localEndPointChannel lep) EndPointClosed
writeTVar (localEndPointState lep) LocalEndPointClosed
writeTVar state (TransportValid $ (localEndPoints ^: Map.delete addr) vst)
apiCloseEndPoint state addr = atomically $ whenValidTransportState state $ \vst -> do

forM_ (Map.toList $ _localEndPoints vst) $
\(theirAddr, lep) -> do

if theirAddr == addr
then do
old <- swapTVar (localEndPointState lep) LocalEndPointClosed
case old of
LocalEndPointClosed -> return ()
LocalEndPointValid lepvst -> do
forM_ (Map.elems (lepvst ^. connections)) $ \lconn -> do
st <- swapTVar (localConnectionState lconn) LocalConnectionClosed
case st of
LocalConnectionClosed -> return ()
LocalConnectionFailed -> return ()
_ -> do
forM_ (vst ^. localEndPointAt (localConnectionRemoteAddress lconn)) $ \thep ->
whenValidLocalEndPointState thep $ \_ -> do
writeTChan (localEndPointChannel thep)
(ConnectionClosed (localConnectionId lconn))
writeTChan (localEndPointChannel lep) EndPointClosed
writeTVar (localEndPointState lep) LocalEndPointClosed

else do
apiBreakConnection state addr theirAddr "remote endpoint disconnected"

writeTVar state (TransportValid $ (localEndPoints ^: Map.delete addr) vst)

-- | Tear down functions that should be called in case if conncetion fails.
apiBreakConnection :: TVar TransportState
Expand Down