mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2025-02-24 15:10:44 +01:00
Code Issues Projects Releases Packages Wiki Activity

Change log level

Browse source
This commit is contained in:
Manfred Karrer 2016-07-17 23:03:24 +02:00
parent 0b74d79d39
commit 31748cbe15
2 changed files with 10 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
network/src/main/java/io/bitsquare/p2p/peers/BroadcastHandler.java
View file

@ -120,7 +120,7 @@ public class BroadcastHandler implements PeerManager.Listener {
timeoutTimer = UserThread.runAfter(() -> { // setup before sending to avoid race conditions timeoutTimer = UserThread.runAfter(() -> { // setup before sending to avoid race conditions
String errorMessage = "Timeout: Broadcast did not complete after " + timeoutDelay + " sec."; String errorMessage = "Timeout: Broadcast did not complete after " + timeoutDelay + " sec.";
log.warn(errorMessage + "\n\t" + log.debug(errorMessage + "\n\t" +
"numOfPeers=" + numOfPeers + "\n\t" + "numOfPeers=" + numOfPeers + "\n\t" +
"numOfCompletedBroadcasts=" + numOfCompletedBroadcasts + "\n\t" + "numOfCompletedBroadcasts=" + numOfCompletedBroadcasts + "\n\t" +
"numOfCompletedBroadcasts=" + numOfCompletedBroadcasts + "\n\t" + "numOfCompletedBroadcasts=" + numOfCompletedBroadcasts + "\n\t" +

25
network/src/main/java/io/bitsquare/p2p/storage/P2PDataStorage.java
View file

@ -214,7 +214,7 @@ public class P2PDataStorage implements MessageListener, ConnectionListener {
printData("before add"); printData("before add");
if (result) { if (result) {
final boolean hasSequenceNrIncreased = hasSequenceNrIncreased(protectedStorageEntry.sequenceNumber, hashOfPayload, false); final boolean hasSequenceNrIncreased = hasSequenceNrIncreased(protectedStorageEntry.sequenceNumber, hashOfPayload);
if (!containsKey || hasSequenceNrIncreased) { if (!containsKey || hasSequenceNrIncreased) {
// At startup we don't have the item so we store it. At updates of the seq nr we store as well. // At startup we don't have the item so we store it. At updates of the seq nr we store as well.
map.put(hashOfPayload, protectedStorageEntry); map.put(hashOfPayload, protectedStorageEntry);
@ -255,7 +255,7 @@ public class P2PDataStorage implements MessageListener, ConnectionListener {
} else { } else {
PublicKey ownerPubKey = storedData.getStoragePayload().getOwnerPubKey(); PublicKey ownerPubKey = storedData.getStoragePayload().getOwnerPubKey();
final boolean checkSignature = checkSignature(ownerPubKey, hashOfDataAndSeqNr, signature); final boolean checkSignature = checkSignature(ownerPubKey, hashOfDataAndSeqNr, signature);
final boolean hasSequenceNrIncreased = hasSequenceNrIncreased(sequenceNumber, hashOfPayload, true); final boolean hasSequenceNrIncreased = hasSequenceNrIncreased(sequenceNumber, hashOfPayload);
final boolean checkIfStoredDataPubKeyMatchesNewDataPubKey = checkIfStoredDataPubKeyMatchesNewDataPubKey(ownerPubKey, hashOfPayload); final boolean checkIfStoredDataPubKeyMatchesNewDataPubKey = checkIfStoredDataPubKeyMatchesNewDataPubKey(ownerPubKey, hashOfPayload);
boolean allValid = checkSignature && boolean allValid = checkSignature &&
hasSequenceNrIncreased && hasSequenceNrIncreased &&
@ -414,31 +414,24 @@ public class P2PDataStorage implements MessageListener, ConnectionListener {
} }
} }
private boolean hasSequenceNrIncreased(int newSequenceNumber, ByteArray hashOfData, boolean calledFromRefreshTTL) { private boolean hasSequenceNrIncreased(int newSequenceNumber, ByteArray hashOfData) {
if (sequenceNumberMap.containsKey(hashOfData)) { if (sequenceNumberMap.containsKey(hashOfData)) {
int storedSequenceNumber = sequenceNumberMap.get(hashOfData).sequenceNr; int storedSequenceNumber = sequenceNumberMap.get(hashOfData).sequenceNr;
if (newSequenceNumber > storedSequenceNumber) { if (newSequenceNumber > storedSequenceNumber) {
return true; return true;
} else if (newSequenceNumber == storedSequenceNumber) { } else if (newSequenceNumber == storedSequenceNumber) {
String msg;
if (newSequenceNumber == 0) { if (newSequenceNumber == 0) {
String msg = "Sequence number is equal to the stored one and both are 0." + msg = "Sequence number is equal to the stored one and both are 0." +
"That is expected for messages which never got updated (mailbox msg)."; "That is expected for messages which never got updated (mailbox msg).";
if (calledFromRefreshTTL)
log.warn(msg);
else
log.debug(msg);
return false;
} else { } else {
String msg = "Sequence number is equal to the stored one. sequenceNumber = " msg = "Sequence number is equal to the stored one. sequenceNumber = "
+ newSequenceNumber + " / storedSequenceNumber=" + storedSequenceNumber; + newSequenceNumber + " / storedSequenceNumber=" + storedSequenceNumber;
if (calledFromRefreshTTL)
log.warn(msg);
else
log.debug(msg);
return false;
} }
log.debug(msg);
return false;
} else { } else {
log.warn("Sequence number is invalid. sequenceNumber = " log.debug("Sequence number is invalid. sequenceNumber = "
+ newSequenceNumber + " / storedSequenceNumber=" + storedSequenceNumber + "\n" + + newSequenceNumber + " / storedSequenceNumber=" + storedSequenceNumber + "\n" +
"That can happen if the data owner gets an old delayed data storage message."); "That can happen if the data owner gets an old delayed data storage message.");
return false; return false;