From 77ac4521908da6bddf0529e28de494d090cd1807 Mon Sep 17 00:00:00 2001 From: Evgeny Poberezkin Date: Mon, 22 Dec 2025 21:56:25 +0000 Subject: [PATCH 1/4] 6.5.0.5 --- simplexmq.cabal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/simplexmq.cabal b/simplexmq.cabal index 2b2e34c08..0fed98afa 100644 --- a/simplexmq.cabal +++ b/simplexmq.cabal @@ -1,7 +1,7 @@ cabal-version: 1.12 name: simplexmq -version: 6.5.0.4 +version: 6.5.0.5 synopsis: SimpleXMQ message broker description: This package includes <./docs/Simplex-Messaging-Server.html server>, <./docs/Simplex-Messaging-Client.html client> and From bbe1c716e644f041a638cc07fc6ce215a5f8b5cb Mon Sep 17 00:00:00 2001 From: Evgeny Date: Tue, 23 Dec 2025 12:42:05 +0000 Subject: [PATCH 2/4] xrcp: treat any 127.x.x.x IP address as local (#1682) --- src/Simplex/RemoteControl/Discovery.hs | 10 +++++----- tests/RemoteControl.hs | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Simplex/RemoteControl/Discovery.hs b/src/Simplex/RemoteControl/Discovery.hs index 9eb714029..c97cfc48c 100644 --- a/src/Simplex/RemoteControl/Discovery.hs +++ b/src/Simplex/RemoteControl/Discovery.hs @@ -14,7 +14,7 @@ import Control.Logger.Simple import Control.Monad import Data.ByteString (ByteString) import Data.Default (def) -import Data.List (delete, find) +import Data.List (delete, find, partition) import Data.Maybe (mapMaybe) import Data.String (IsString) import qualified Data.Text as T @@ -53,11 +53,11 @@ getLocalAddress preferred_ = ok -> Just RCCtrlAddress {address = THIPv4 ok, interface = T.pack name} mkLastLocalHost :: [RCCtrlAddress] -> [RCCtrlAddress] -mkLastLocalHost addrs = case find localHost addrs of - Nothing -> addrs - Just lh -> delete lh addrs <> [lh] +mkLastLocalHost addrs = other <> local where - localHost RCCtrlAddress {address = a} = a == THIPv4 (127, 0, 0, 1) + (local, other) = partition localHost addrs + localHost RCCtrlAddress {address = THIPv4 (127, _, _, _)} = True + localHost _ = False preferAddress :: RCCtrlAddress -> [RCCtrlAddress] -> [RCCtrlAddress] preferAddress RCCtrlAddress {address, interface} addrs = diff --git a/tests/RemoteControl.hs b/tests/RemoteControl.hs index d4987b33b..134b2f255 100644 --- a/tests/RemoteControl.hs +++ b/tests/RemoteControl.hs @@ -9,7 +9,7 @@ import AgentTests.FunctionalAPITests (runRight) import Control.Logger.Simple import Crypto.Random (ChaChaDRG) import qualified Data.Aeson as J -import Data.ByteString.Lazy.Char8 as LB +import qualified Data.ByteString.Lazy.Char8 as LB import Data.List.NonEmpty (NonEmpty (..)) import qualified Simplex.Messaging.Crypto as C import Simplex.Messaging.Encoding.String (StrEncoding (..)) From 2ea98db9d8ad0dc43820227a89c744822dfadb5d Mon Sep 17 00:00:00 2001 From: Evgeny Poberezkin Date: Tue, 23 Dec 2025 12:42:46 +0000 Subject: [PATCH 3/4] 6.4.7.0 --- simplexmq.cabal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/simplexmq.cabal b/simplexmq.cabal index cf711f055..ebbf156db 100644 --- a/simplexmq.cabal +++ b/simplexmq.cabal @@ -1,7 +1,7 @@ cabal-version: 1.12 name: simplexmq -version: 6.4.6.0 +version: 6.4.7.0 synopsis: SimpleXMQ message broker description: This package includes <./docs/Simplex-Messaging-Server.html server>, <./docs/Simplex-Messaging-Client.html client> and From 5f73d1e629a8807f1b9d94f8b411d6480a0a59fb Mon Sep 17 00:00:00 2001 From: Evgeny Poberezkin Date: Tue, 23 Dec 2025 18:00:26 +0000 Subject: [PATCH 4/4] 6.5.0.6 --- simplexmq.cabal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/simplexmq.cabal b/simplexmq.cabal index 0fed98afa..fbc46f612 100644 --- a/simplexmq.cabal +++ b/simplexmq.cabal @@ -1,7 +1,7 @@ cabal-version: 1.12 name: simplexmq -version: 6.5.0.5 +version: 6.5.0.6 synopsis: SimpleXMQ message broker description: This package includes <./docs/Simplex-Messaging-Server.html server>, <./docs/Simplex-Messaging-Client.html client> and