Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

CAD-3444 snocket changes from p2p-master #3369

Merged
merged 6 commits into from
Sep 20, 2021
Merged

CAD-3444 snocket changes from p2p-master #3369

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
feef08f
Snocket.Accept
coot May 22, 2020
cbda9be
Use a counter to provide a unique remote addr
karknu Jun 11, 2021
ab942f9
snockets - monadic toBearer
coot Sep 16, 2021
dc7b4d4
snocket: support getLocalName for named pipes (Windows)
coot Sep 16, 2021
f1d68a3
snocket: store local and remote path
coot Sep 16, 2021
e7efa14
snocket: make Window's LocalSocket strict
coot Sep 16, 2021
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
18 changes: 12 additions & 6 deletions ouroboros-network-framework/src/Ouroboros/Network/Snocket.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,7 +345,13 @@ type LocalHandle = Socket
--
#if defined(mingw32_HOST_OS)
data LocalSocket = LocalSocket { getLocalHandle :: LocalHandle
-- ^ underlying windows 'HANDLE'
, getLocalPath :: LocalAddress
-- ^ original path, used when creating the handle
, getRemotePath :: LocalAddress
-- ^ unique identifier (not a real path). It
-- makes the pair of local and remote
-- addresses unique.
}
deriving (Eq, Generic)
deriving Show via Quiet LocalSocket
Expand All @@ -369,7 +375,7 @@ localSnocket :: IOManager -> LocalSnocket
#if defined(mingw32_HOST_OS)
localSnocket ioManager = Snocket {
getLocalAddr = return . getLocalPath
, getRemoteAddr = return . getLocalPath
, getRemoteAddr = return . getRemotePath
, addrFamily = LocalFamily

, open = \(LocalFamily addr) -> do
Expand All @@ -389,7 +395,7 @@ localSnocket ioManager = Snocket {
`catch` \(SomeAsyncException _) -> do
Win32.closeHandle hpipe
throwIO e
pure (LocalSocket hpipe addr)
pure (LocalSocket hpipe addr (LocalAddress ""))

-- To connect, simply create a file whose name is the named pipe name.
, openToConnect = \(LocalAddress pipeName) -> do
Expand All @@ -407,14 +413,14 @@ localSnocket ioManager = Snocket {
`catch` \(SomeAsyncException _) -> do
Win32.closeHandle hpipe
throwIO e
return (LocalSocket hpipe (LocalAddress pipeName))
return (LocalSocket hpipe (LocalAddress pipeName) (LocalAddress pipeName))
, connect = \_ _ -> pure ()

-- Bind and listen are no-op.
, bind = \_ _ -> pure ()
, listen = \_ -> pure ()

, accept = \sock@(LocalSocket hpipe addr) -> Accept $ do
, accept = \sock@(LocalSocket hpipe addr _) -> Accept $ do
Win32.Async.connectNamedPipe hpipe
return (Accepted sock addr, acceptNext 0 addr)

Expand Down Expand Up @@ -462,7 +468,7 @@ localSnocket ioManager = Snocket {
-- remote end's address.
--
let addr' = LocalAddress $ "\\\\.\\pipe\\ouroboros-network-temp-" ++ show cnt
coot marked this conversation as resolved.
Show resolved Hide resolved
return (Accepted (LocalSocket hpipe addr') addr', acceptNext (succ cnt) addr)
return (Accepted (LocalSocket hpipe addr addr') addr', acceptNext (succ cnt) addr)

-- local snocket on unix
#else
Expand Down Expand Up @@ -527,7 +533,7 @@ socketFileDescriptor = fmap (FileDescriptor . fromIntegral) . Socket.unsafeFdSoc
localSocketFileDescriptor :: LocalSocket -> IO FileDescriptor
#if defined(mingw32_HOST_OS)
localSocketFileDescriptor =
\(LocalSocket fd _) -> case ptrToIntPtr fd of
\(LocalSocket fd _ _) -> case ptrToIntPtr fd of
IntPtr i -> return (FileDescriptor i)
#else
localSocketFileDescriptor = socketFileDescriptor . getLocalHandle
Expand Down