echelon/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* I2CP:

Browse Source 
- Fix leak if nonce = 0 but reliability != none
   - More work on failure codes (ticket #788)
   - Fix race with _finished indication in OCMOSJ
This commit is contained in:
zzz
2013-01-02 13:19:40 +00:00
parent 2ea9fc5d61
commit e375ffe8f1
3 changed files with 42 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
core/java/src/net/i2p/client/MessageStatusMessageHandler.java
View File

@ -30,10 +30,12 @@ class MessageStatusMessageHandler extends HandlerImpl {
if (_log.shouldLog(Log.DEBUG))
_log.debug("Handle message " + message);
MessageStatusMessage msg = (MessageStatusMessage) message;
switch (msg.getStatus()) {
int status = msg.getStatus();
long id = msg.getMessageId();
switch (status) {
case MessageStatusMessage.STATUS_AVAILABLE:
ReceiveMessageBeginMessage m = new ReceiveMessageBeginMessage();
m.setMessageId(msg.getMessageId());
m.setMessageId(id);
m.setSessionId(msg.getSessionId());
try {
session.sendMessage(m);
@ -41,27 +43,23 @@ class MessageStatusMessageHandler extends HandlerImpl {
_log.error("Error asking for the message", ise);
}
return;
case MessageStatusMessage.STATUS_SEND_ACCEPTED:
session.receiveStatus((int)msg.getMessageId(), msg.getNonce(), msg.getStatus());
session.receiveStatus((int)id, msg.getNonce(), status);
// noop
return;
case MessageStatusMessage.STATUS_SEND_BEST_EFFORT_SUCCESS:
case MessageStatusMessage.STATUS_SEND_GUARANTEED_SUCCESS:
if (_log.shouldLog(Log.INFO))
_log.info("Message delivery succeeded for message " + msg.getMessageId());
//if (!skipStatus)
session.receiveStatus((int)msg.getMessageId(), msg.getNonce(), msg.getStatus());
return;
case MessageStatusMessage.STATUS_SEND_BEST_EFFORT_FAILURE:
case MessageStatusMessage.STATUS_SEND_GUARANTEED_FAILURE:
if (_log.shouldLog(Log.INFO))
_log.info("Message delivery FAILED for message " + msg.getMessageId());
//if (!skipStatus)
session.receiveStatus((int)msg.getMessageId(), msg.getNonce(), msg.getStatus());
return;
default:
if (_log.shouldLog(Log.ERROR))
_log.error("Invalid message delivery status received: " + msg.getStatus());
if (msg.isSuccessful()) {
if (_log.shouldLog(Log.DEBUG))
_log.debug("Message delivery succeeded for message " + id);
} else {
if (_log.shouldLog(Log.INFO))
_log.info("Message delivery FAILED (" + status + ") for message " + id);
}
//if (!skipStatus)
session.receiveStatus((int)id, msg.getNonce(), status);
return;
}
}
}
}