Skip to content

remote control: fall back to IPv4 when IPv6 bind fails #1832

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

Draft
Narasimha-sc wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

remote control: fall back to IPv4 when IPv6 bind fails #1832

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 6 additions & 1 deletion src/Simplex/RemoteControl/Discovery.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,12 +80,17 @@ preferAddress RCCtrlAddress {address, interface} addrs =
startTLSServer :: Maybe Word16 -> TMVar (Maybe N.PortNumber) -> TLS.Credential -> TLS.ServerHooks -> (Transport.TLS 'TServer -> IO ()) -> IO (Async ())
startTLSServer port_ startedOnPort credentials hooks server = async . liftIO $ do
started <- newEmptyTMVarIO
bracketOnError (startTCPServer started Nothing $ maybe "0" show port_) (\_e -> setPort Nothing) $ \socket ->
bracketOnError (startTCPServerCtrl started $ maybe "0" show port_) (\_e -> setPort Nothing) $ \socket ->
ifM
(atomically $ readTMVar started)
(runServer started socket)
(setPort Nothing)
where
-- Bind preferring IPv6 (dual-stack) as before; if that fails (e.g. IPv6 is
-- disabled), fall back to IPv4 so the (IPv4-only) invitation stays reachable.
startTCPServerCtrl started port =
startTCPServer started Nothing port
`catchAny` \_ -> startTCPServer started (Just "0.0.0.0") port
runServer started socket = do
port <- N.socketPort socket
logInfo $ "System-assigned port: " <> tshow port
Expand Down
Loading