dandri/simplexmq
1
0
Fork 0
mirror of https://github.com/simplex-chat/simplexmq.git synced 2026-06-04 04:21:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into ep/cmd-auth

Browse Source
This commit is contained in:
Evgeny Poberezkin
2024-02-05 21:02:38 +00:00
parent 5b2af24df9 189885c50d
commit fa848decd2
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Simplex/Messaging/Transport.hs
+3 -4
View File
@@ -87,7 +87,7 @@ import qualified Network.TLS.Extra as TE
import qualified Paths_simplexmq as SMQ import qualified Paths_simplexmq as SMQ
import qualified Simplex.Messaging.Crypto as C import qualified Simplex.Messaging.Crypto as C
import Simplex.Messaging.Encoding import Simplex.Messaging.Encoding
import Simplex.Messaging.Parsers (dropPrefix, parse, parseRead1, sumTypeJSON) import Simplex.Messaging.Parsers (dropPrefix, parseRead1, sumTypeJSON)
import Simplex.Messaging.Transport.Buffer import Simplex.Messaging.Transport.Buffer
import Simplex.Messaging.Util (bshow, catchAll, catchAll_) import Simplex.Messaging.Util (bshow, catchAll, catchAll_)
import Simplex.Messaging.Version import Simplex.Messaging.Version
@@ -423,10 +423,9 @@ smpThHandle th v pk k_ =
sendHandshake :: (Transport c, Encoding smp) => THandle c -> smp -> ExceptT TransportError IO () sendHandshake :: (Transport c, Encoding smp) => THandle c -> smp -> ExceptT TransportError IO ()
sendHandshake th = ExceptT . tPutBlock th . smpEncode sendHandshake th = ExceptT . tPutBlock th . smpEncode
-- The parser in getHandshake ignores all bytes that follow the handshake, allowing to extend it. -- ignores tail bytes to allow future extensions
-- This version extends server handshake with the SMP relay DH public key for command authorization.
getHandshake :: (Transport c, Encoding smp) => THandle c -> ExceptT TransportError IO smp getHandshake :: (Transport c, Encoding smp) => THandle c -> ExceptT TransportError IO smp
getHandshake th = ExceptT $ (parse smpP (TEHandshake PARSE) =<<) <$> tGetBlock th getHandshake th = ExceptT $ (first (\_ -> TEHandshake PARSE) . A.parseOnly smpP =<<) <$> tGetBlock th
smpTHandle :: Transport c => c -> THandle c smpTHandle :: Transport c => c -> THandle c
smpTHandle c = THandle {connection = c, sessionId = tlsUnique c, blockSize = smpBlockSize, thVersion = 0, thAuth = Nothing, batch = False} smpTHandle c = THandle {connection = c, sessionId = tlsUnique c, blockSize = smpBlockSize, thVersion = 0, thAuth = Nothing, batch = False}