Author: toad
Date: 2008-01-16 11:53:33 +0000 (Wed, 16 Jan 2008)
New Revision: 17065
Modified:
trunk/freenet/src/freenet/node/NodeDispatcher.java
trunk/freenet/src/freenet/node/PeerNode.java
Log:
Remove old ping code (we have used the packet RTT for some time).
Modified: trunk/freenet/src/freenet/node/NodeDispatcher.java
===================================================================
--- trunk/freenet/src/freenet/node/NodeDispatcher.java 2008-01-16 08:46:01 UTC
(rev 17064)
+++ trunk/freenet/src/freenet/node/NodeDispatcher.java 2008-01-16 11:53:33 UTC
(rev 17065)
@@ -69,10 +69,6 @@
// Ignore
}
return true;
- } else if(spec == DMT.FNPLinkPong) {
- long id = m.getLong(DMT.PING_SEQNO);
- source.receivedLinkPong(id);
- return true;
} else if(spec == DMT.FNPDetectedIPAddress) {
Peer p = (Peer) m.getObject(DMT.EXTERNAL_ADDRESS);
source.setRemoteDetectedPeer(p);
Modified: trunk/freenet/src/freenet/node/PeerNode.java
===================================================================
--- trunk/freenet/src/freenet/node/PeerNode.java 2008-01-16 08:46:01 UTC
(rev 17064)
+++ trunk/freenet/src/freenet/node/PeerNode.java 2008-01-16 11:53:33 UTC
(rev 17065)
@@ -2556,60 +2556,6 @@
return pRejected.currentValue();
}
- public void sendPing() {
- long pingNo;
- long now = System.currentTimeMillis();
- Long lPingNo;
- synchronized(pingSync) {
- pingNo = pingNumber++;
- lPingNo = new Long(pingNo);
- Long lnow = new Long(now);
- pingsSentTimes.push(lPingNo, lnow);
- if(logMINOR)
- Logger.minor(this, "Pushed " + lPingNo + ' ' +
lnow);
- while(pingsSentTimes.size() > MAX_PINGS) {
- Long l = (Long) pingsSentTimes.popValue();
- if(logMINOR)
- Logger.minor(this,
"pingsSentTimes.size()=" + pingsSentTimes.size() + ", l=" + l);
- long tStarted = l.longValue();
- pingAverage.report(now - tStarted);
- if(logMINOR)
- Logger.minor(this, "Reporting dumped
ping time to " + this + " : " + (now - tStarted));
- }
- }
- Message msg = DMT.createFNPLinkPing(pingNo);
- try {
- sendAsync(msg, null, 0, null);
- } catch(NotConnectedException e) {
- synchronized(pingSync) {
- pingsSentTimes.removeKey(lPingNo);
- }
- }
- }
-
- public void receivedLinkPong(long id) {
- Long lid = new Long(id);
- long startTime;
- long now = System.currentTimeMillis();
- synchronized(pingSync) {
- Long s = (Long) pingsSentTimes.get(lid);
- if(s == null) {
- Logger.normal(this, "Dropping ping " + id + "
on " + this);
- return;
- }
- startTime = s.longValue();
- pingsSentTimes.removeKey(lid);
- pingAverage.report(now - startTime);
- if(logMINOR)
- Logger.minor(this, "Reporting ping time to " +
this + " : " + (now - startTime));
- }
-
- if(noLongerRoutable()) {
- invalidate();
- setPeerNodeStatus(now);
- }
- }
-
public double averagePingTime() {
return pingAverage.currentValue();
}
