bitmessage/Jabit
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Inventory items are now saved only if processing didn't fail. Receiving messages works, but there seems to be a problem with the POW check in some circumstances.

Browse Source
This commit is contained in:
Christian Basler
2015-05-23 10:27:05 +02:00
parent 6b3b361aa3
commit b793526f2f
22 changed files with 82 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
networking/src/main/java/ch/dissem/bitmessage/networking/Connection.java
View File

@@ -121,7 +121,7 @@ public class Connection implements Runnable {
+ msg.getPayload().getCommand());
}
}
} catch (SocketTimeoutException e) {
} catch (SocketTimeoutException ignore) {
if (state == ACTIVE) {
sendQueue();
}
@@ -157,12 +157,11 @@ public class Connection implements Runnable {
try {
LOG.debug("Received object " + objectMessage.getInventoryVector());
Security.checkProofOfWork(objectMessage, ctx.getNetworkNonceTrialsPerByte(), ctx.getNetworkExtraBytes());
listener.receive(objectMessage);
ctx.getInventory().storeObject(objectMessage);
} catch (IOException e) {
LOG.debug(e.getMessage(), e);
LOG.error("Stream " + objectMessage.getStream() + ", object type " + objectMessage.getType() + ": " + e.getMessage(), e);
}
// It's probably pointless, but let the listener decide if we accept the message for the client.
listener.receive(objectMessage);
break;
case ADDR:
Addr addr = (Addr) messagePayload;