diff --git a/auth/request.go b/auth/request.go index a37839fd8eb065258a61867bc45a671bc3b55dc7..69058971d7be48823f936b39fbf4bac89fb6072d 100644 --- a/auth/request.go +++ b/auth/request.go @@ -56,6 +56,8 @@ func (s *state) Request(partner contact.Contact, myfacts fact.FactList) (id.Roun // request internal helper func (s *state) request(partner contact.Contact, myfacts fact.FactList, reset bool) (id.Round, error) { + jww.INFO.Printf("request(...) called") + //do key generation rng := s.rng.GetStream() defer rng.Close() @@ -102,14 +104,21 @@ func (s *state) request(partner contact.Contact, myfacts fact.FactList, reset bo } contents := request.Marshal() + jww.TRACE.Printf("Request ECRPAYLOAD: %v", request.GetEcrPayload()) + jww.TRACE.Printf("Request MAC: %v", mac) + + jww.INFO.Printf("Requesting Auth with %s, msgDigest: %s", + partner.ID, format.DigestContents(contents)) + //register the confirm fingerprint to pick up confirm err = s.net.AddFingerprint(me, confirmFp, &receivedConfirmService{ s: s, SentRequest: sr, }) if err != nil { - return 0, errors.Errorf("Failed to register fingperint request "+ - "to %s from %s, bailing request", partner.ID, me) + return 0, errors.Errorf("cannot register fingerprint request "+ + "to %s from %s, bailing request: %+v", partner.ID, me, + err) } //register service for notification on confirmation @@ -119,12 +128,6 @@ func (s *state) request(partner contact.Contact, myfacts fact.FactList, reset bo Metadata: partner.ID[:], }, nil) - jww.TRACE.Printf("Request ECRPAYLOAD: %v", request.GetEcrPayload()) - jww.TRACE.Printf("Request MAC: %v", mac) - - jww.INFO.Printf("Requesting Auth with %s, msgDigest: %s", - partner.ID, format.DigestContents(contents)) - p := cmix.GetDefaultCMIXParams() p.DebugTag = "auth.Request" svc := message.Service{ diff --git a/cmix/message/fingerprints.go b/cmix/message/fingerprints.go index dcef3a77fec43a4854978c28901a98d6374aa639..071425109681fce4774e91ec4821dd94e1fe3571 100644 --- a/cmix/message/fingerprints.go +++ b/cmix/message/fingerprints.go @@ -8,9 +8,10 @@ package message import ( + "sync" + jww "github.com/spf13/jwalterweatherman" "gitlab.com/xx_network/crypto/csprng" - "sync" "github.com/pkg/errors" "gitlab.com/elixxir/primitives/format" @@ -64,6 +65,7 @@ func (f *FingerprintsManager) pop(clientID *id.ID, // identity in the session func (f *FingerprintsManager) AddFingerprint(clientID *id.ID, fingerprint format.Fingerprint, mp Processor) error { + jww.INFO.Printf("AddFingerprint: %s", fingerprint) f.Lock() defer f.Unlock()