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

Language fixups.

Browse Source
This commit is contained in:
dg2-new
2015-06-08 16:14:08 +00:00
parent e8f4e19bac
commit fa8c390267
39 changed files with 107 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
router/java/src/net/i2p/data/i2np/DataMessage.java
View File

@@ -49,7 +49,7 @@ public class DataMessage extends FastI2NPMessageImpl {
long size = DataHelper.fromLong(data, curIndex, 4);
curIndex += 4;
if (size > MAX_SIZE)
throw new I2NPMessageException("wtf, size=" + size);
throw new I2NPMessageException("too large msg, size=" + size);
_data = new byte[(int)size];
System.arraycopy(data, curIndex, _data, 0, (int)size);
}

4
router/java/src/net/i2p/data/i2np/DeliveryInstructions.java
View File

@@ -357,8 +357,8 @@ public class DeliveryInstructions extends DataStructureImpl {
int offset = 0;
offset += getAdditionalInfo(rv, offset);
if (offset != additionalSize)
//_log.log(Log.CRIT, "wtf, additionalSize = " + additionalSize + ", offset = " + offset);
throw new IllegalStateException("wtf, additionalSize = " + additionalSize + ", offset = " + offset);
//_log.log(Log.CRIT, "size mismatch, additionalSize = " + additionalSize + ", offset = " + offset);
throw new IllegalStateException("size mismatch, additionalSize = " + additionalSize + ", offset = " + offset);
return rv;
}

2
router/java/src/net/i2p/data/i2np/I2NPMessageReader.java
View File

@@ -164,7 +164,7 @@ public class I2NPMessageReader {
_listener.disconnected(I2NPMessageReader.this);
cancelRunner();
} catch (Exception e) {
_log.log(Log.CRIT, "wtf, error reading", e);
_log.log(Log.CRIT, "error reading msg!", e);
_listener.readError(I2NPMessageReader.this, e);
_listener.disconnected(I2NPMessageReader.this);
cancelRunner();

4
router/java/src/net/i2p/data/i2np/TunnelGatewayMessage.java
View File

@@ -62,7 +62,7 @@ public class TunnelGatewayMessage extends FastI2NPMessageImpl {
if (_msg != null)
throw new IllegalStateException();
if (msg == null)
throw new IllegalArgumentException("wtf, dont set me to null");
throw new IllegalArgumentException("dont set me to null!");
_msg = msg;
}
@@ -137,7 +137,7 @@ public class TunnelGatewayMessage extends FastI2NPMessageImpl {
//handler.readMessage(data, curIndex);
//_msg = handler.lastRead();
//if (_msg == null)
// throw new I2NPMessageException("wtf, message read has no payload?");
// throw new I2NPMessageException("impossible? message read has no payload?!");
// NEW WAY save lots of effort at the IBGW by reading as an UnknownI2NPMessage instead
// This will save a lot of object churn and processing,

2
router/java/src/net/i2p/data/i2np/UnknownI2NPMessage.java
View File

@@ -48,7 +48,7 @@ public class UnknownI2NPMessage extends FastI2NPMessageImpl {
throw new IllegalStateException();
if (type != _type) throw new I2NPMessageException("Message type is incorrect for this message");
if (dataSize > MAX_SIZE)
throw new I2NPMessageException("wtf, size=" + dataSize);
throw new I2NPMessageException("size mismatch, too big, size=" + dataSize);
_data = new byte[dataSize];
System.arraycopy(data, offset, _data, 0, dataSize);
}

2
router/java/src/net/i2p/data/router/RouterInfo.java
View File

@@ -308,7 +308,7 @@ public class RouterInfo extends DatabaseEntry {
*/
protected byte[] getBytes() throws DataFormatException {
if (_byteified != null) return _byteified;
if (_identity == null) throw new DataFormatException("Router identity isn't set? wtf!");
if (_identity == null) throw new DataFormatException("Router identity isn't set?!");
//long before = Clock.getInstance().now();
ByteArrayOutputStream out = new ByteArrayOutputStream(2*1024);

4
router/java/src/net/i2p/router/Banlist.java
View File

@@ -162,11 +162,11 @@ public class Banlist {
*/
public boolean banlistRouter(Hash peer, String reason, String reasonCode, String transport, long expireOn) {
if (peer == null) {
_log.error("wtf, why did we try to banlist null?", new Exception("banfaced"));
_log.error("why did we try to banlist null?", new Exception("banfaced"));
return false;
}
if (peer.equals(_context.routerHash())) {
_log.error("wtf, why did we try to banlist ourselves?", new Exception("banfaced"));
_log.error("why did we try to banlist ourselves?", new Exception("banfaced"));
return false;
}
boolean wasAlready = false;

2
router/java/src/net/i2p/router/JobQueue.java
View File

@@ -591,7 +591,7 @@ public class JobQueue {
} catch (Throwable t) {
_context.clock().removeUpdateListener(this);
if (_log.shouldLog(Log.ERROR))
_log.error("wtf, pumper killed", t);
_log.error("pumper killed?!", t);
}
}

2
router/java/src/net/i2p/router/JobQueueRunner.java
View File

@@ -117,7 +117,7 @@ class JobQueueRunner extends I2PThread {
//if ( (jobNum % 10) == 0)
// System.gc();
} catch (Throwable t) {
_log.log(Log.CRIT, "WTF, error running?", t);
_log.log(Log.CRIT, "error running?", t);
}
}
//_state = 16;

2
router/java/src/net/i2p/router/Router.java
View File

@@ -852,7 +852,7 @@ public class Router implements RouterClock.ClockShiftListener {
addCapabilities(ri);
SigningPrivateKey key = _context.keyManager().getSigningPrivateKey();
if (key == null) {
_log.log(Log.CRIT, "Internal error - signing private key not known? wtf");
_log.log(Log.CRIT, "Internal error - signing private key not known? Impossible?");
return;
}
ri.sign(key);

2
router/java/src/net/i2p/router/dummy/VMCommSystem.java
View File

@@ -122,7 +122,7 @@ public class VMCommSystem extends CommSystemFacade {
_ctx.inNetMessagePool().add(msg, null, _from);
} catch (Exception e) {
_log.error("wtf, error reading/formatting a VM message?", e);
_log.error("Error reading/formatting a VM message? Something is not right...", e);
}
}
public String getName() { return "Receive Message"; }

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

@@ -58,7 +58,7 @@ public class SendMessageDirectJob extends JobImpl {
_targetHash = toPeer;
if (timeoutMs < 10*1000) {
if (_log.shouldLog(Log.WARN))
_log.warn("Very little time given [" + timeoutMs + "], resetting to 5s", new Exception("stingy bastard"));
_log.warn("Very little time given [" + timeoutMs + "], resetting to 5s", new Exception("stingy caller!"));
_expiration = ctx.clock().now() + 10*1000;
} else {
_expiration = timeoutMs + ctx.clock().now();

2
router/java/src/net/i2p/router/networkdb/kademlia/FloodfillNetworkDatabaseFacade.java
View File

@@ -129,7 +129,7 @@ public class FloodfillNetworkDatabaseFacade extends KademliaNetworkDatabaseFacad
*/
@Override
public void publish(RouterInfo localRouterInfo) throws IllegalArgumentException {
if (localRouterInfo == null) throw new IllegalArgumentException("wtf, null localRouterInfo?");
if (localRouterInfo == null) throw new IllegalArgumentException("impossible: null localRouterInfo?");
// should this be after super? why not publish locally?
if (_context.router().isHidden()) return; // DE-nied!
super.publish(localRouterInfo);

2
router/java/src/net/i2p/router/networkdb/kademlia/IterativeLookupJob.java
View File

@@ -58,7 +58,7 @@ class IterativeLookupJob extends JobImpl {
continue;
}
if (peer.equals(from)) {
// wtf
// unusual
invalidPeers++;
continue;
}

2
router/java/src/net/i2p/router/networkdb/kademlia/KademliaNetworkDatabaseFacade.java
View File

@@ -646,7 +646,7 @@ public class KademliaNetworkDatabaseFacade extends NetworkDatabaseFacade {
try {
store(h, localLeaseSet);
} catch (IllegalArgumentException iae) {
_log.error("wtf, locally published leaseSet is not valid?", iae);
_log.error("locally published leaseSet is not valid?", iae);
throw iae;
}
if (!_context.clientManager().shouldPublishLeaseSet(h))

2
router/java/src/net/i2p/router/networkdb/kademlia/PersistentDataStore.java
View File

@@ -484,7 +484,7 @@ class PersistentDataStore extends TransientDataStore {
// don't overwrite recent netdb RIs with reseed data
return fileDate > _knownDate + (60*60*1000);
} else {
// wtf - prevent injection from reseeding
// safety measure - prevent injection from reseeding
_log.error("Prevented LS overwrite by RI " + _key + " from " + _routerFile);
return false;
}

8
router/java/src/net/i2p/router/networkdb/kademlia/SearchJob.java
View File

@@ -94,7 +94,7 @@ class SearchJob extends JobImpl {
Job onSuccess, Job onFailure, long timeoutMs, boolean keepStats, boolean isLease) {
super(context);
if ( (key == null) || (key.getData() == null) )
throw new IllegalArgumentException("Search for null key? wtf");
throw new IllegalArgumentException("Search for null key?");
_log = getContext().logManager().getLog(getClass());
_facade = facade;
_state = new SearchState(getContext(), key);
@@ -425,7 +425,7 @@ class SearchJob extends JobImpl {
Hash to = router.getIdentity().getHash();
TunnelInfo inTunnel = getContext().tunnelManager().selectInboundExploratoryTunnel(to);
if (inTunnel == null) {
_log.warn("No tunnels to get search replies through! wtf!");
_log.warn("No tunnels to get search replies through!");
getContext().jobQueue().addJob(new FailedJob(getContext(), router));
return;
}
@@ -436,7 +436,7 @@ class SearchJob extends JobImpl {
//RouterInfo inGateway = getContext().netDb().lookupRouterInfoLocally(inTunnel.getPeer(0));
//if (inGateway == null) {
// _log.error("We can't find the gateway to our inbound tunnel?! wtf");
// _log.error("We can't find the gateway to our inbound tunnel?!");
// getContext().jobQueue().addJob(new FailedJob(getContext(), router));
// return;
//}
@@ -448,7 +448,7 @@ class SearchJob extends JobImpl {
TunnelInfo outTunnel = getContext().tunnelManager().selectOutboundExploratoryTunnel(to);
if (outTunnel == null) {
_log.warn("No tunnels to send search out through! wtf!");
_log.warn("No tunnels to send search out through! Impossible?");
getContext().jobQueue().addJob(new FailedJob(getContext(), router));
return;
}

2
router/java/src/net/i2p/router/networkdb/kademlia/SearchUpdateReplyFoundJob.java
View File

@@ -101,7 +101,7 @@ class SearchUpdateReplyFoundJob extends JobImpl implements ReplyJob {
_job.replyFound((DatabaseSearchReplyMessage)message, _peer);
} else {
if (_log.shouldLog(Log.ERROR))
_log.error(getJobId() + ": WTF, reply job matched a strange message: " + message);
_log.error(getJobId() + ": What?! Reply job matched a strange message: " + message);
return;
}

2
router/java/src/net/i2p/router/networkdb/kademlia/SingleLookupJob.java
View File

@@ -42,7 +42,7 @@ class SingleLookupJob extends JobImpl {
Hash peer = _dsrm.getReply(i);
if (peer.equals(getContext().routerHash())) // us
continue;
if (peer.equals(from)) // wtf
if (peer.equals(from)) // unusual?
continue;
RouterInfo ri = getContext().netDb().lookupRouterInfoLocally(peer);
if (ri == null)

2
router/java/src/net/i2p/router/peermanager/CapacityCalculator.java
View File

@@ -173,7 +173,7 @@ class CapacityCalculator {
case 30*60*1000: return .3;
case 60*60*1000: return .2;
case 24*60*60*1000: return .1;
default: throw new IllegalArgumentException("wtf, period [" + period + "]???");
default: throw new IllegalArgumentException("undefined period passed, period [" + period + "]???");
}
}
}

6
router/java/src/net/i2p/router/peermanager/PeerTestJob.java
View File

@@ -115,7 +115,7 @@ public class PeerTestJob extends JobImpl {
private void testPeer(RouterInfo peer) {
TunnelInfo inTunnel = getInboundTunnelId();
if (inTunnel == null) {
_log.warn("No tunnels to get peer test replies through! wtf!");
_log.warn("No tunnels to get peer test replies through!");
return;
}
TunnelId inTunnelId = inTunnel.getReceiveTunnelId(0);
@@ -123,7 +123,7 @@ public class PeerTestJob extends JobImpl {
RouterInfo inGateway = getContext().netDb().lookupRouterInfoLocally(inTunnel.getPeer(0));
if (inGateway == null) {
if (_log.shouldLog(Log.WARN))
_log.warn("We can't find the gateway to our inbound tunnel?! wtf");
_log.warn("We can't find the gateway to our inbound tunnel?! Impossible?");
return;
}
@@ -135,7 +135,7 @@ public class PeerTestJob extends JobImpl {
TunnelInfo outTunnel = getOutboundTunnelId();
if (outTunnel == null) {
_log.warn("No tunnels to send search out through! wtf!");
_log.warn("No tunnels to send search out through! Something is wrong...");
return;
}

2
router/java/src/net/i2p/router/startup/LoadRouterInfoJob.java
View File

@@ -83,7 +83,7 @@ class LoadRouterInfoJob extends JobImpl {
try {
// if we have a routerinfo but no keys, things go bad in a hurry:
// CRIT ...rkdb.PublishLocalRouterInfoJob: Internal error - signing private key not known? rescheduling publish for 30s
// CRIT net.i2p.router.Router : Internal error - signing private key not known? wtf
// CRIT net.i2p.router.Router : Internal error - signing private key not known? Impossible?
// CRIT ...sport.udp.EstablishmentManager: Error in the establisher java.lang.NullPointerException
// at net.i2p.router.transport.udp.PacketBuilder.buildSessionConfirmedPacket(PacketBuilder.java:574)
// so pretend the RI isn't there if there is no keyfile

2
router/java/src/net/i2p/router/transport/GetBidsJob.java
View File

@@ -58,7 +58,7 @@ class GetBidsJob extends JobImpl {
Hash us = context.routerHash();
if (to.equals(us)) {
if (log.shouldLog(Log.ERROR))
log.error("wtf, send a message to ourselves? nuh uh. msg = " + msg);
log.error("send a message to ourselves? nuh uh. msg = " + msg);
context.statManager().addRateData("transport.bidFailSelf", msg.getLifetime());
fail(context, msg);
return;

4
router/java/src/net/i2p/router/transport/OutboundMessageRegistry.java
View File

@@ -195,9 +195,9 @@ public class OutboundMessageRegistry {
*/
private void registerPending(OutNetMessage msg, boolean allowEmpty) {
if ( (!allowEmpty) && (msg.getMessage() == null) )
throw new IllegalArgumentException("OutNetMessage doesn't contain an I2NPMessage? wtf");
throw new IllegalArgumentException("OutNetMessage doesn't contain an I2NPMessage? Impossible?");
MessageSelector sel = msg.getReplySelector();
if (sel == null) throw new IllegalArgumentException("No reply selector? wtf");
if (sel == null) throw new IllegalArgumentException("No reply selector? Impossible?");
if (!_activeMessages.add(msg))
return; // dont add dups

6
router/java/src/net/i2p/router/transport/TransportImpl.java
View File

@@ -373,9 +373,9 @@ public abstract class TransportImpl implements Transport {
+ "): " + allTime + "ms/" + sendTime + "ms after failing on: "
+ msg.getFailedTransports() + " and succeeding on " + getStyle());
if ( (allTime > 60*1000) && (sendSuccessful) ) {
// WTF!!@#
// VERY slow
if (_log.shouldLog(Log.WARN))
_log.warn("WTF, more than a minute slow? " + msg.getMessageType()
_log.warn("Severe latency? More than a minute slow? " + msg.getMessageType()
+ " of id " + msg.getMessageId() + " (send begin on "
+ new Date(msg.getSendBegin()) + " / created on "
+ new Date(msg.getCreated()) + "): " + msg);
@@ -497,7 +497,7 @@ public abstract class TransportImpl implements Transport {
_listener.messageReceived(inMsg, remoteIdent, remoteIdentHash);
} else {
if (_log.shouldLog(Log.ERROR))
_log.error("WTF! Null listener! this = " + toString(), new Exception("Null listener"));
_log.error("Null listener! this = " + toString(), new Exception("Null listener"));
}
}

2
router/java/src/net/i2p/router/transport/TransportManager.java
View File

@@ -530,7 +530,7 @@ public class TransportManager implements TransportEventListener {
if (msg == null)
throw new IllegalArgumentException("Null message? no bidding on a null outNetMessage!");
if (_context.router().getRouterInfo().equals(msg.getTarget()))
throw new IllegalArgumentException("WTF, bids for a message bound to ourselves?");
throw new IllegalArgumentException("Bids for a message bound to ourselves?");
List<TransportBid> rv = new ArrayList<TransportBid>(_transports.size());
Set<String> failedTransports = msg.getFailedTransports();

2
router/java/src/net/i2p/router/transport/ntcp/NTCPSendFinisher.java
View File

@@ -100,7 +100,7 @@ class NTCPSendFinisher {
// appx 0.1 ms
//_context.statManager().addRateData("ntcp.sendFinishTime", _context.clock().now() - _queued, 0);
} catch (Throwable t) {
_log.log(Log.CRIT, " wtf, afterSend borked", t);
_log.log(Log.CRIT, " afterSend broken?", t);
}
}
}

2
router/java/src/net/i2p/router/transport/udp/ACKSender.java
View File

@@ -168,7 +168,7 @@ class ACKSender implements Runnable {
if (wanted < 0) {
if (_log.shouldLog(Log.WARN))
_log.warn("wtf, why are we acking something they dont want? remaining=" + remaining + ", peer=" + peer + ", bitfields=" + ackBitfields);
_log.warn("why are we acking something they dont want? remaining=" + remaining + ", peer=" + peer + ", bitfields=" + ackBitfields);
continue;
}

2
router/java/src/net/i2p/router/transport/udp/OutboundMessageFragments.java
View File

@@ -178,7 +178,7 @@ class OutboundMessageFragments {
public void add(OutboundMessageState state) {
PeerState peer = state.getPeer();
if (peer == null)
throw new RuntimeException("wtf, null peer for " + state);
throw new RuntimeException("null peer for " + state);
peer.add(state);
add(peer);
//_context.statManager().addRateData("udp.outboundActiveCount", active, 0);

2
router/java/src/net/i2p/router/tunnel/BatchedPreprocessor.java
View File

@@ -370,7 +370,7 @@ class BatchedPreprocessor extends TrivialPreprocessor {
if (offset <= 0) {
StringBuilder buf = new StringBuilder(128);
buf.append("wtf, written offset is ").append(offset);
buf.append("uh? written offset is ").append(offset);
buf.append(" for ").append(startAt).append(" through ").append(sendThrough);
for (int i = startAt; i <= sendThrough; i++) {
buf.append(" ").append(pending.get(i).toString());

2
router/java/src/net/i2p/router/tunnel/FragmentHandler.java
View File

@@ -164,7 +164,7 @@ class FragmentHandler {
if (_log.shouldLog(Log.ERROR))
_log.error("Corrupt fragment received: offset = " + offset, e);
_context.statManager().addRateData("tunnel.corruptMessage", 1, 1);
// java.lang.IllegalStateException: wtf, don't get the completed size when we're not complete - null fragment i=0 of 1
// java.lang.IllegalStateException: don't get the completed size when we're not complete - null fragment i=0 of 1
// at net.i2p.router.tunnel.FragmentedMessage.getCompleteSize(FragmentedMessage.java:194)
// at net.i2p.router.tunnel.FragmentedMessage.toByteArray(FragmentedMessage.java:223)
// at net.i2p.router.tunnel.FragmentHandler.receiveComplete(FragmentHandler.java:380)

4
router/java/src/net/i2p/router/tunnel/FragmentedMessage.java
View File

@@ -164,7 +164,7 @@ class FragmentedMessage {
}
public int getCompleteSize() {
if (!_lastReceived)
throw new IllegalStateException("wtf, don't get the completed size when we're not complete");
throw new IllegalStateException("don't get the completed size when we're not complete!");
if (_releasedAfter > 0) {
RuntimeException e = new RuntimeException("use after free in FragmentedMessage");
_log.error("FM completeSize()", e);
@@ -175,7 +175,7 @@ class FragmentedMessage {
ByteArray ba = _fragments[i];
// NPE seen here, root cause unknown
if (ba == null)
throw new IllegalStateException("wtf, don't get the completed size when we're not complete - null fragment i=" + i + " of " + _highFragmentNum);
throw new IllegalStateException("don't get the completed size when we're not complete! - null fragment i=" + i + " of " + _highFragmentNum);
size += ba.getValid();
}
return size;

2
router/java/src/net/i2p/router/tunnel/InboundGatewayProcessor.java
View File

@@ -20,6 +20,6 @@ class InboundGatewayProcessor extends HopProcessor {
public void process(byte orig[], int offset, int length) {
boolean ok = super.process(orig, offset, length, null);
if (!ok)
throw new RuntimeException("wtf, we are the gateway, how did it fail?");
throw new RuntimeException("we are the gateway, how did it fail?");
}
}

2
router/java/src/net/i2p/router/tunnel/InboundMessageDistributor.java
View File

@@ -188,7 +188,7 @@ class InboundMessageDistributor implements GarlicMessageReceiver.CloveReceiver {
TunnelId outId = out.getSendTunnelId(0);
if (outId == null) {
if (_log.shouldLog(Log.ERROR))
_log.error("wtf, outbound tunnel has no outboundId? " + out
_log.error("strange? outbound tunnel has no outboundId? " + out
+ " failing to distribute " + msg);
return;
}

4
router/java/src/net/i2p/router/tunnel/TunnelDispatcher.java
View File

@@ -630,7 +630,7 @@ public class TunnelDispatcher implements Service {
* @param targetPeer gateway to the tunnel to receive the message
*/
public void dispatchOutbound(I2NPMessage msg, TunnelId outboundTunnel, TunnelId targetTunnel, Hash targetPeer) {
if (outboundTunnel == null) throw new IllegalArgumentException("wtf, null outbound tunnel?");
if (outboundTunnel == null) throw new IllegalArgumentException("null outbound tunnel?");
long before = _context.clock().now();
TunnelGateway gw = _outboundGateways.get(outboundTunnel);
if (gw != null) {
@@ -677,7 +677,7 @@ public class TunnelDispatcher implements Service {
//long dispatchTime = _context.clock().now() - before;
//if (dispatchTime > 1000) {
// if (_log.shouldLog(Log.WARN))
// _log.warn("wtf, took " + dispatchTime + " to dispatch " + msg + " out " + outboundTunnel + " in " + gw);
// _log.warn("slow? took " + dispatchTime + " to dispatch " + msg + " out " + outboundTunnel + " in " + gw);
//}
//if (gw instanceof TunnelGatewayZeroHop)
// _context.statManager().addRateData("tunnel.dispatchOutboundZeroHopTime", dispatchTime, dispatchTime);

2
router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java
View File

@@ -352,7 +352,7 @@ class BuildHandler implements Runnable {
default:
_context.statManager().addRateData("tunnel.receiveRejectionCritical", 1);
}
// penalize peer based on their bitchiness level
// penalize peer based on their reported error level
_context.profileManager().tunnelRejected(peer, rtt, howBad);
_context.messageHistory().tunnelParticipantRejected(peer, "peer rejected after " + rtt + " with " + howBad + ": " + cfg.toString());
}

2
router/java/src/net/i2p/router/tunnel/pool/TunnelPool.java
View File

@@ -749,7 +749,7 @@ public class TunnelPool {
TunnelId inId = tunnel.getReceiveTunnelId(0);
Hash gw = tunnel.getPeer(0);
if ( (inId == null) || (gw == null) ) {
_log.error(toString() + ": wtf, tunnel has no inbound gateway/tunnelId? " + tunnel);
_log.error(toString() + ": broken? tunnel has no inbound gateway/tunnelId? " + tunnel);
continue;
}
Lease lease = new Lease();