Merge branch 'ricochet-port' of dan/cwtch into master

This commit is contained in:
Sarah Jamie Lewis 2018-05-31 20:08:48 +00:00 committed by Gogs
commit becfe7c928
2 changed files with 2 additions and 2 deletions

View File

@ -208,7 +208,7 @@ func (cp *CwtchPeer) Listen() error {
} }
}) })
cwtchpeer.Init(cp.Profile.OnionPrivateKey, af, new(application.AcceptAllContactManager)) cwtchpeer.Init(cp.Profile.Name, cp.Profile.OnionPrivateKey, af, new(application.AcceptAllContactManager))
log.Printf("Running cwtch peer on %v", l.Addr().String()) log.Printf("Running cwtch peer on %v", l.Addr().String())
cwtchpeer.Run(l) cwtchpeer.Run(l)
return nil return nil

View File

@ -66,7 +66,7 @@ func (s *Server) Run(privateKeyFile string) {
} }
}) })
cwtchserver.Init(pk, af, new(application.AcceptAllContactManager)) cwtchserver.Init("cwtch server for " + l.Addr().String()[0:16], pk, af, new(application.AcceptAllContactManager))
log.Printf("cwtch server running on cwtch:%s", l.Addr().String()[0:16]) log.Printf("cwtch server running on cwtch:%s", l.Addr().String()[0:16])
cwtchserver.Run(l) cwtchserver.Run(l)
} }