Merge branch 'garbledMessageLogging' into 'release'

Garbled message logging

See merge request !125

network/message/garbled.go

@@ -45,6 +45,7 @@ func (m *Manager) processGarbledMessages(stop *stoppable.Single) {
 			stop.ToStopped()
 			return
 		case <-m.triggerGarbled:
+			jww.INFO.Printf("[GARBLE] Checking Garbled messages")
 			m.handleGarbledMessages()
 		}
 	}
@@ -59,7 +60,7 @@ func (m *Manager) handleGarbledMessages() {
 	for grbldMsg, count, timestamp, has := garbledMsgs.Next(); has; grbldMsg, count, timestamp, has = garbledMsgs.Next() {
 		//if it exists, check against all in the list
 		modifiedContents := append([]byte{0}, grbldMsg.GetContents()...)
-		identity := m.Session.GetUser().GetContact().ID
+		identity := m.Session.GetUser().ReceptionID
 		_, forMe, _ := m.Session.GetEdge().Check(identity, grbldMsg.GetIdentityFP(), modifiedContents)
 		if forMe {
 			fingerprint := grbldMsg.GetKeyFP()

network/message/handler.go

@@ -72,9 +72,9 @@ func (m *Manager) handleMessage(ecrMsg format.Message, bundle Bundle, edge *edge
 				identity.Source, expectedFP, ecrMsg.GetIdentityFP())
 		}
 		im := fmt.Sprintf("Garbled/RAW Message: keyFP: %v, round: %d"+
-			"msgDigest: %s, not determined to be for client", msg.GetKeyFP(), bundle.Round, msg.Digest())
+			"msgDigest: %s, not determined to be for client", ecrMsg.GetKeyFP(), bundle.Round, ecrMsg.Digest())
 		m.Internal.Events.Report(1, "MessageReception", "Garbled", im)
-		m.Session.GetGarbledMessages().Add(msg)
+		m.Session.GetGarbledMessages().Add(ecrMsg)
 		return
 	}
 

network/message/sendCmix.go

@@ -123,7 +123,7 @@ func sendCmixHelper(sender *gateway.Sender, msg format.Message,
 			jww.WARN.Printf("Best round on send is nil")
 			continue
 		}
-		jww.DEBUG.Printf("[sendCMIX] bestRound: %v", bestRound)
+		jww.TRACE.Printf("[sendCMIX] bestRound: %v", bestRound)
 
 		// add the round on to the list of attempted, so it is not tried again
 		attempted.Insert(bestRound.GetRoundId())
@@ -149,7 +149,7 @@ func sendCmixHelper(sender *gateway.Sender, msg format.Message,
 			continue
 		}
 
-		jww.DEBUG.Printf("[sendCMIX] round %v processed, firstGW: %s",
+		jww.TRACE.Printf("[sendCMIX] round %v processed, firstGW: %s",
 			bestRound, firstGateway)
 
 		// Build the messages to send
@@ -196,7 +196,7 @@ func sendCmixHelper(sender *gateway.Sender, msg format.Message,
 			}
 			return result, err
 		}
-		jww.DEBUG.Printf("[sendCMIX] sendToPreferred %s", firstGateway)
+		jww.TRACE.Printf("[sendCMIX] sendToPreferred %s", firstGateway)
 		result, err := sender.SendToPreferred(
 			[]*id.ID{firstGateway}, sendFunc, stop, cmixParams.SendTimeout)
 		jww.DEBUG.Printf("[sendCMIX] sendToPreferred %s returned",

network/message/sendCmixUtils.go

@@ -159,8 +159,6 @@ func buildSlotMessage(msg format.Message, recipient *id.ID, target *id.ID,
 
 	msg.SetIdentityFP(ifp)
 
-	jww.INFO.Printf("Sending to %s with preimage %v, ifp: %v", recipient, preimage, ifp)
-
 	// Encrypt the message
 	salt := make([]byte, 32)
 	_, err = stream.Read(salt)

storage/utility/meteredCmixMessageBuffer.go

@@ -114,6 +114,10 @@ func LoadMeteredCmixMessageBuffer(kv *versioned.KV, key string) (*MeteredCmixMes
 }
 
 func (mcmb *MeteredCmixMessageBuffer) Add(m format.Message) {
+	if m.GetPrimeByteLen()==0{
+		jww.FATAL.Panicf("Cannot handle a metered " +
+			"cmix message with a length of 0")
+	}
 	msg := meteredCmixMessage{
 		M:         m.Marshal(),
 		Count:     0,