diff --git a/api/send.go b/api/send.go index a83862dd9f73df28a663e4655aedcbb8d2961ac6..e4a544a5005d5bd60e145ad4ce0057aae6cfbcee 100644 --- a/api/send.go +++ b/api/send.go @@ -37,7 +37,7 @@ func (c *Client) SendUnsafe(m message.Send, param params.Unsafe) ([]id.Round, // if it fails. func (c *Client) SendCMIX(msg format.Message, param params.CMIX) (id.Round, error) { - jww.INFO.Printf("SendCMIX(%v)", msg) + jww.INFO.Printf("SendCMIX(%s)", string(msg.GetContents())) return c.network.SendCMIX(msg, param) } diff --git a/cmd/root.go b/cmd/root.go index 92477b699c1748503836187208cff8bca94f342f..285d0edb7e0c0a65906a94fcdfca1c8dad9abe37 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -178,7 +178,8 @@ var rootCmd = &cobra.Command{ done = true break case m := <-recvCh: - fmt.Printf("Message received: %v", m) + fmt.Printf("Message received: %s", string( + m.Payload)) break } } diff --git a/network/follow.go b/network/follow.go index 264e0c2c00932758626994f652998f6f4d621fa6..fb77f3a9f4b388fcfc463444f7771566b055c141 100644 --- a/network/follow.go +++ b/network/follow.go @@ -62,7 +62,7 @@ var followCnt int = 0 // executes each iteration of the follower func (m *manager) follow(rng csprng.Source, comms followNetworkComms) { - jww.INFO.Printf("follow: %d", followCnt) + jww.TRACE.Printf("follow: %d", followCnt) followCnt++ //randomly select a gateway to poll @@ -148,8 +148,4 @@ func (m *manager) follow(rng csprng.Source, comms followNetworkComms) { // messages for the user (bloom not implemented yet) checkedRounds.RangeUncheckedMasked(gwRoundsState, roundChecker, int(m.param.MaxCheckedRounds)) - - wr := m.Instance.GetWaitingRounds() - - jww.INFO.Printf("WaitingRounds: %+v, %d", wr.GetSlice(), wr.Len()) } diff --git a/network/message/handler.go b/network/message/handler.go index 66eb7ad268a7791dfa8e1ef0f66d4413d64381eb..33a2d5e1a28ed9ddd6e0c09558f4fafe80352913 100644 --- a/network/message/handler.go +++ b/network/message/handler.go @@ -62,6 +62,7 @@ func (m *Manager) handleMessage(ecrMsg format.Message) { } else { // if it doesnt match any form of encrypted, hear it as a raw message // and add it to garbled messages to be handled later + msg = ecrMsg raw := message.Receive{ Payload: msg.GetRawContents(), MessageType: message.Raw,