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

* ClientMessage: Remove unused MessageReceptionInfo

Browse Source 
* RouterContext: Remove unused MessageStateMonitor
This commit is contained in:
zzz
2011-09-19 13:44:33 +00:00
parent 04785e25b9
commit 47d2b80aa5
4 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
router/java/src/net/i2p/router/ClientMessage.java
View File

@ -23,7 +23,7 @@ public class ClientMessage {
private Payload _payload; private Payload _payload;
private Destination _destination; private Destination _destination;
private Destination _fromDestination; private Destination _fromDestination;
private MessageReceptionInfo _receptionInfo; //private MessageReceptionInfo _receptionInfo;
private SessionConfig _senderConfig; private SessionConfig _senderConfig;
private Hash _destinationHash; private Hash _destinationHash;
private MessageId _messageId; private MessageId _messageId;
@ -77,8 +77,8 @@ public class ClientMessage {
* originated ones. * originated ones.
* *
*/ */
public MessageReceptionInfo getReceptionInfo() { return _receptionInfo; } //public MessageReceptionInfo getReceptionInfo() { return _receptionInfo; }
public void setReceptionInfo(MessageReceptionInfo info) { _receptionInfo = info; } //public void setReceptionInfo(MessageReceptionInfo info) { _receptionInfo = info; }
/** /**
* Retrieve the session config of the client that sent the message. This will only be available * Retrieve the session config of the client that sent the message. This will only be available

1
router/java/src/net/i2p/router/MessageReceptionInfo.java
View File

@ -14,6 +14,7 @@ import net.i2p.data.TunnelId;
/** /**
* Wrap up the details of how a ClientMessage was received from the network * Wrap up the details of how a ClientMessage was received from the network
* *
* @deprecated unused
*/ */
public class MessageReceptionInfo { public class MessageReceptionInfo {
private Hash _fromPeer; private Hash _fromPeer;

1
router/java/src/net/i2p/router/MessageStateMonitor.java
View File

@ -5,6 +5,7 @@ import net.i2p.util.Log;
/** /**
* Keep track of the inbound and outbound messages in memory. * Keep track of the inbound and outbound messages in memory.
* *
* @deprecated unused
*/ */
public class MessageStateMonitor { public class MessageStateMonitor {
private Log _log; private Log _log;

8
router/java/src/net/i2p/router/RouterContext.java
View File

@ -56,7 +56,7 @@ public class RouterContext extends I2PAppContext {
private Shitlist _shitlist; private Shitlist _shitlist;
private Blocklist _blocklist; private Blocklist _blocklist;
private MessageValidator _messageValidator; private MessageValidator _messageValidator;
private MessageStateMonitor _messageStateMonitor; //private MessageStateMonitor _messageStateMonitor;
private RouterThrottle _throttle; private RouterThrottle _throttle;
private final Set<Runnable> _finalShutdownTasks; private final Set<Runnable> _finalShutdownTasks;
// split up big lock on this to avoid deadlocks // split up big lock on this to avoid deadlocks
@ -141,7 +141,7 @@ public class RouterContext extends I2PAppContext {
_outNetMessagePool = new OutNetMessagePool(this); _outNetMessagePool = new OutNetMessagePool(this);
_messageHistory = new MessageHistory(this); _messageHistory = new MessageHistory(this);
_messageRegistry = new OutboundMessageRegistry(this); _messageRegistry = new OutboundMessageRegistry(this);
_messageStateMonitor = new MessageStateMonitor(this); //_messageStateMonitor = new MessageStateMonitor(this);
if ("false".equals(getProperty("i2p.dummyNetDb", "false"))) if ("false".equals(getProperty("i2p.dummyNetDb", "false")))
_netDb = new FloodfillNetworkDatabaseFacade(this); // new KademliaNetworkDatabaseFacade(this); _netDb = new FloodfillNetworkDatabaseFacade(this); // new KademliaNetworkDatabaseFacade(this);
else else
@ -253,13 +253,15 @@ public class RouterContext extends I2PAppContext {
* The registry is used by outbound messages to wait for replies. * The registry is used by outbound messages to wait for replies.
*/ */
public OutboundMessageRegistry messageRegistry() { return _messageRegistry; } public OutboundMessageRegistry messageRegistry() { return _messageRegistry; }
/** /**
* The monitor keeps track of inbound and outbound messages currently held in * The monitor keeps track of inbound and outbound messages currently held in
* memory / queued for processing. We'll use this to throttle the router so * memory / queued for processing. We'll use this to throttle the router so
* we don't overflow. * we don't overflow.
* *
*/ */
public MessageStateMonitor messageStateMonitor() { return _messageStateMonitor; } //public MessageStateMonitor messageStateMonitor() { return _messageStateMonitor; }
/** /**
* Our db cache * Our db cache
*/ */