logging and javadoc tweaks

This commit is contained in:
zzz
2010-01-10 22:01:00 +00:00
parent da1a50bfeb
commit 3cd6520758
7 changed files with 22 additions and 12 deletions

View File

@@ -19,7 +19,7 @@ import net.i2p.util.Log;
/**
* Build a HandleDatabaseLookupMessageJob whenever a DatabaseLookupMessage arrives
*
* Unused - see kademlia/ for replacement
*/
public class DatabaseLookupMessageHandler implements HandlerJobBuilder {
private RouterContext _context;

View File

@@ -18,7 +18,7 @@ import net.i2p.router.RouterContext;
/**
* Create a HandleDatabaseStoreMessageJob whenever a DatabaseStoreMessage arrives
*
* Unused - see kademlia/ for replacement
*/
public class DatabaseStoreMessageHandler implements HandlerJobBuilder {
private RouterContext _context;

View File

@@ -33,7 +33,7 @@ import net.i2p.util.Log;
/**
* Handle a lookup for a key received from a remote peer. Needs to be implemented
* to send back replies, etc
*
* Unused directly - see kademlia/ for extension
*/
public class HandleDatabaseLookupMessageJob extends JobImpl {
private Log _log;

View File

@@ -22,7 +22,7 @@ import net.i2p.util.Log;
/**
* Receive DatabaseStoreMessage data and store it in the local net db
*
* Unused - see kademlia/ for replacement
*/
public class HandleDatabaseStoreMessageJob extends JobImpl {
private Log _log;

View File

@@ -64,6 +64,11 @@ public class HandleFloodfillDatabaseStoreMessageJob extends JobImpl {
RouterInfo prevNetDb = null;
if (_message.getValueType() == DatabaseStoreMessage.KEY_TYPE_LEASESET) {
getContext().statManager().addRateData("netDb.storeLeaseSetHandled", 1, 0);
Hash key = _message.getKey();
if (_log.shouldLog(Log.INFO))
_log.info("Handling dbStore of leaseset " + _message);
//_log.info("Handling dbStore of leasset " + key + " with expiration of "
// + new Date(_message.getLeaseSet().getEarliestLeaseDate()));
try {
// Never store a leaseSet for a local dest received from somebody else.
@@ -72,18 +77,18 @@ public class HandleFloodfillDatabaseStoreMessageJob extends JobImpl {
// somebody has our keys...
// This could happen with multihoming - where it's really important to prevent
// storing the other guy's leaseset, it will confuse us badly.
if (getContext().clientManager().isLocal(_message.getKey())) {
if (getContext().clientManager().isLocal(key)) {
//getContext().statManager().addRateData("netDb.storeLocalLeaseSetAttempt", 1, 0);
// throw rather than return, so that we send the ack below (prevent easy attack)
throw new IllegalArgumentException("Peer attempted to store local leaseSet: " +
_message.getKey().toBase64().substring(0, 4));
key.toBase64().substring(0, 4));
}
LeaseSet ls = _message.getLeaseSet();
// mark it as something we received, so we'll answer queries
// for it. this flag does NOT get set on entries that we
// receive in response to our own lookups.
ls.setReceivedAsPublished(true);
LeaseSet match = getContext().netDb().store(_message.getKey(), _message.getLeaseSet());
LeaseSet match = getContext().netDb().store(key, _message.getLeaseSet());
if ( (match == null) || (match.getEarliestLeaseDate() < _message.getLeaseSet().getEarliestLeaseDate()) ) {
wasNew = true;
} else {

View File

@@ -49,7 +49,7 @@ public class OutboundTunnelEndpoint {
_log.debug("outbound tunnel " + _config + " received a full message: " + msg
+ " to be forwarded on to "
+ (toRouter != null ? toRouter.toBase64().substring(0,4) : "")
+ (toTunnel != null ? toTunnel.getTunnelId() + "" : ""));
+ (toTunnel != null ? ":" + toTunnel.getTunnelId() : ""));
// don't drop it if we are the target
if ((!_context.routerHash().equals(toRouter)) &&
_context.tunnelDispatcher().shouldDropParticipatingMessage("OBEP " + msg.getType(), msg.getMessageSize()))