I2P_Developers/i2p.itoopie
3
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

InNetMessage now needs a reference to a context, so give it one

Browse Source
This commit is contained in:
jrandom
2004-06-20 00:26:05 +00:00
committed by zzz
parent bab7b8b9ed
commit 91b1fd6d07
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
router/java/src/net/i2p/router/message/HandleTunnelMessageJob.java
View File

@ -76,6 +76,8 @@ public class HandleTunnelMessageJob extends JobImpl {
return; return;
} }
info.messageProcessed();
info = getUs(info); info = getUs(info);
if (info == null) { if (info == null) {
if (_log.shouldLog(Log.ERROR)) if (_log.shouldLog(Log.ERROR))
@ -284,7 +286,7 @@ public class HandleTunnelMessageJob extends JobImpl {
} }
private void sendToLocal(I2NPMessage body) { private void sendToLocal(I2NPMessage body) {
InNetMessage msg = new InNetMessage(); InNetMessage msg = new InNetMessage(_context);
msg.setMessage(body); msg.setMessage(body);
msg.setFromRouter(_from); msg.setFromRouter(_from);
msg.setFromRouterHash(_fromHash); msg.setFromRouterHash(_fromHash);
@ -480,7 +482,7 @@ public class HandleTunnelMessageJob extends JobImpl {
_log.info("Message for tunnel " + _info.getTunnelId() + _log.info("Message for tunnel " + _info.getTunnelId() +
" received at the gateway (us), but its a 0 length tunnel though it is a " " received at the gateway (us), but its a 0 length tunnel though it is a "
+ _body.getClass().getName() + ", so process it locally"); + _body.getClass().getName() + ", so process it locally");
InNetMessage msg = new InNetMessage(); InNetMessage msg = new InNetMessage(HandleLocallyJob.this._context);
msg.setFromRouter(_from); msg.setFromRouter(_from);
msg.setFromRouterHash(_fromHash); msg.setFromRouterHash(_fromHash);
msg.setMessage(_body); msg.setMessage(_body);

2
router/java/src/net/i2p/router/message/MessageHandler.java
View File

@ -100,7 +100,7 @@ class MessageHandler {
private void handleLocalRouter(I2NPMessage message, RouterIdentity from, Hash fromHash, SourceRouteBlock replyBlock, boolean ackUsed) { private void handleLocalRouter(I2NPMessage message, RouterIdentity from, Hash fromHash, SourceRouteBlock replyBlock, boolean ackUsed) {
_log.info("Handle " + message.getClass().getName() + " to a local router - toss it on the inbound network pool"); _log.info("Handle " + message.getClass().getName() + " to a local router - toss it on the inbound network pool");
InNetMessage msg = new InNetMessage(); InNetMessage msg = new InNetMessage(_context);
msg.setFromRouter(from); msg.setFromRouter(from);
msg.setFromRouterHash(fromHash); msg.setFromRouterHash(fromHash);
msg.setMessage(message); msg.setMessage(message);

2
router/java/src/net/i2p/router/message/SendMessageDirectJob.java
View File

@ -145,7 +145,7 @@ public class SendMessageDirectJob extends JobImpl {
if (_onSend != null) if (_onSend != null)
_context.jobQueue().addJob(_onSend); _context.jobQueue().addJob(_onSend);
InNetMessage msg = new InNetMessage(); InNetMessage msg = new InNetMessage(_context);
msg.setFromRouter(_router.getIdentity()); msg.setFromRouter(_router.getIdentity());
msg.setMessage(_message); msg.setMessage(_message);
_context.inNetMessagePool().add(msg); _context.inNetMessagePool().add(msg);