From 80339483f0ce434c8f938ae32acae208d0dbff2e Mon Sep 17 00:00:00 2001 From: erinn Date: Tue, 9 Oct 2018 17:01:18 -0700 Subject: [PATCH 1/3] update setuponionv3 call to match an update to libricochet --- server/server.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/server/server.go b/server/server.go index c73416f..fc2138a 100644 --- a/server/server.go +++ b/server/server.go @@ -9,6 +9,7 @@ import ( "git.openprivacy.ca/openprivacy/libricochet-go/application" "git.openprivacy.ca/openprivacy/libricochet-go/channels" "log" + "git.openprivacy.ca/openprivacy/libricochet-go/utils" ) // Server encapsulates a complete, compliant Cwtch server. @@ -25,7 +26,7 @@ func (s *Server) Run(serverConfig Config) { cwtchserver := new(application.RicochetApplication) s.metricsPack.Start(cwtchserver, s.config.ServerReporting.LogMetricsToFile) - l, err := application.SetupOnionV3("127.0.0.1:9051", "tcp4", "", s.config.PrivateKey, 9878) + l, err := application.SetupOnionV3("127.0.0.1:9051", "tcp4", "", s.config.PrivateKey, utils.GetTorV3Hostname(s.config.PublicKey), 9878) if err != nil { log.Fatalf("error setting up onion service: %v", err) From ebf846e00336dfce286e388a83749fdc9b8c6a7f Mon Sep 17 00:00:00 2001 From: erinn Date: Tue, 9 Oct 2018 17:04:06 -0700 Subject: [PATCH 2/3] Revert "update setuponionv3 call to match an update to libricochet" This reverts commit 80339483f0ce434c8f938ae32acae208d0dbff2e. --- server/server.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/server/server.go b/server/server.go index fc2138a..c73416f 100644 --- a/server/server.go +++ b/server/server.go @@ -9,7 +9,6 @@ import ( "git.openprivacy.ca/openprivacy/libricochet-go/application" "git.openprivacy.ca/openprivacy/libricochet-go/channels" "log" - "git.openprivacy.ca/openprivacy/libricochet-go/utils" ) // Server encapsulates a complete, compliant Cwtch server. @@ -26,7 +25,7 @@ func (s *Server) Run(serverConfig Config) { cwtchserver := new(application.RicochetApplication) s.metricsPack.Start(cwtchserver, s.config.ServerReporting.LogMetricsToFile) - l, err := application.SetupOnionV3("127.0.0.1:9051", "tcp4", "", s.config.PrivateKey, utils.GetTorV3Hostname(s.config.PublicKey), 9878) + l, err := application.SetupOnionV3("127.0.0.1:9051", "tcp4", "", s.config.PrivateKey, 9878) if err != nil { log.Fatalf("error setting up onion service: %v", err) From 475fea02d2050641ebfaf698e31eb119e40ec1c5 Mon Sep 17 00:00:00 2001 From: erinn Date: Tue, 9 Oct 2018 17:06:36 -0700 Subject: [PATCH 3/3] fix setuponionv3 call for initial asaur update --- server/server.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/server/server.go b/server/server.go index c73416f..fc2138a 100644 --- a/server/server.go +++ b/server/server.go @@ -9,6 +9,7 @@ import ( "git.openprivacy.ca/openprivacy/libricochet-go/application" "git.openprivacy.ca/openprivacy/libricochet-go/channels" "log" + "git.openprivacy.ca/openprivacy/libricochet-go/utils" ) // Server encapsulates a complete, compliant Cwtch server. @@ -25,7 +26,7 @@ func (s *Server) Run(serverConfig Config) { cwtchserver := new(application.RicochetApplication) s.metricsPack.Start(cwtchserver, s.config.ServerReporting.LogMetricsToFile) - l, err := application.SetupOnionV3("127.0.0.1:9051", "tcp4", "", s.config.PrivateKey, 9878) + l, err := application.SetupOnionV3("127.0.0.1:9051", "tcp4", "", s.config.PrivateKey, utils.GetTorV3Hostname(s.config.PublicKey), 9878) if err != nil { log.Fatalf("error setting up onion service: %v", err)