From 7e5111a1008b43a2f240bd18a0c6b1bcadb02d84 Mon Sep 17 00:00:00 2001 From: Afshin Arani Date: Wed, 3 May 2023 16:08:21 +0330 Subject: [PATCH] Network: hide HS methods from public API There are some HS-related methods in TorStream and TorCircuit which are not supposed to be called by users directly (they should be used by TorServiceClient and TorServiceHost), this commit marks them as internal. --- NOnion/Network/TorCircuit.fs | 6 +++--- NOnion/Network/TorStream.fs | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/NOnion/Network/TorCircuit.fs b/NOnion/Network/TorCircuit.fs index 39edec50..441f7af9 100644 --- a/NOnion/Network/TorCircuit.fs +++ b/NOnion/Network/TorCircuit.fs @@ -1191,7 +1191,7 @@ and TorCircuit member self.CreateAsync guardDetailOpt = self.Create guardDetailOpt |> Async.StartAsTask - member __.Introduce(introduceMsg: RelayIntroduce) = + member internal __.Introduce(introduceMsg: RelayIntroduce) = async { let! completionTaskRes = circuitOperationsMailBox.PostAndAsyncReply( @@ -1211,7 +1211,7 @@ and TorCircuit |> FSharpUtil.WithTimeout Constants.CircuitOperationTimeout } - member __.WaitingForRendezvousJoin + member internal __.WaitingForRendezvousJoin (clientRandomPrivateKey: X25519PrivateKeyParameters) (clientRandomPublicKey: X25519PublicKeyParameters) (introAuthPublicKey: Ed25519PublicKeyParameters) @@ -1240,7 +1240,7 @@ and TorCircuit } - member __.Rendezvous + member internal __.Rendezvous (cookie: array) (clientRandomKey: X25519PublicKeyParameters) (introAuthPublicKey: Ed25519PublicKeyParameters) diff --git a/NOnion/Network/TorStream.fs b/NOnion/Network/TorStream.fs index 4fc2ec27..97a8acae 100644 --- a/NOnion/Network/TorStream.fs +++ b/NOnion/Network/TorStream.fs @@ -432,7 +432,7 @@ type TorStream(circuit: TorCircuit) = override _.Flush() = () - static member Accept (streamId: uint16) (circuit: TorCircuit) = + static member internal Accept (streamId: uint16) (circuit: TorCircuit) = async { // We can't use the "use" keyword since this stream needs // to outlive this function. @@ -461,7 +461,7 @@ type TorStream(circuit: TorCircuit) = member self.EndAsync() = self.End() |> Async.StartAsTask - member self.ConnectToService(port: int) = + member internal self.ConnectToService(port: int) = async { let! completionTaskRes = streamControlMailBox.PostAndAsyncReply(