Merge branch 'detports2' of cwtch.im/cwtch into master

This commit is contained in:
erinn 2018-10-10 00:07:36 +00:00 committed by Gogs
commit 66880628a4
1 changed files with 2 additions and 1 deletions

View File

@ -9,6 +9,7 @@ import (
"git.openprivacy.ca/openprivacy/libricochet-go/application" "git.openprivacy.ca/openprivacy/libricochet-go/application"
"git.openprivacy.ca/openprivacy/libricochet-go/channels" "git.openprivacy.ca/openprivacy/libricochet-go/channels"
"log" "log"
"git.openprivacy.ca/openprivacy/libricochet-go/utils"
) )
// Server encapsulates a complete, compliant Cwtch server. // Server encapsulates a complete, compliant Cwtch server.
@ -25,7 +26,7 @@ func (s *Server) Run(serverConfig Config) {
cwtchserver := new(application.RicochetApplication) cwtchserver := new(application.RicochetApplication)
s.metricsPack.Start(cwtchserver, s.config.ServerReporting.LogMetricsToFile) 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 { if err != nil {
log.Fatalf("error setting up onion service: %v", err) log.Fatalf("error setting up onion service: %v", err)