Author: nextgens
Date: 2008-07-21 23:27:37 +0000 (Mon, 21 Jul 2008)
New Revision: 21300
Modified:
trunk/freenet/src/freenet/io/comm/DMT.java
trunk/freenet/src/freenet/node/NodeDispatcher.java
Log:
get rid of FNPLinkPingPong as we already have FNPPing
Modified: trunk/freenet/src/freenet/io/comm/DMT.java
===================================================================
--- trunk/freenet/src/freenet/io/comm/DMT.java 2008-07-21 23:10:14 UTC (rev
21299)
+++ trunk/freenet/src/freenet/io/comm/DMT.java 2008-07-21 23:27:37 UTC (rev
21300)
@@ -29,9 +29,7 @@
import freenet.support.Buffer;
import freenet.support.Fields;
import freenet.support.ShortBuffer;
-import java.nio.DoubleBuffer;
-
/**
* @author ian
*
@@ -988,27 +986,7 @@
msg.set(PING_SEQNO, seqNo);
return msg;
}
-
- public static final MessageType FNPLinkPing = new
MessageType("FNPLinkPing", PRIORITY_HIGH) {{
- addField(PING_SEQNO, Long.class);
- }};
- public static final Message createFNPLinkPing(long seqNo) {
- Message msg = new Message(FNPLinkPing);
- msg.set(PING_SEQNO, seqNo);
- return msg;
- }
-
- public static final MessageType FNPLinkPong = new
MessageType("FNPLinkPong", PRIORITY_HIGH) {{
- addField(PING_SEQNO, Long.class);
- }};
-
- public static final Message createFNPLinkPong(long seqNo) {
- Message msg = new Message(FNPLinkPong);
- msg.set(PING_SEQNO, seqNo);
- return msg;
- }
-
public static final MessageType FNPPong = new MessageType("FNPPong",
PRIORITY_HIGH) {{
addField(PING_SEQNO, Integer.class);
}};
Modified: trunk/freenet/src/freenet/node/NodeDispatcher.java
===================================================================
--- trunk/freenet/src/freenet/node/NodeDispatcher.java 2008-07-21 23:10:14 UTC
(rev 21299)
+++ trunk/freenet/src/freenet/node/NodeDispatcher.java 2008-07-21 23:27:37 UTC
(rev 21300)
@@ -98,15 +98,6 @@
if(logMINOR) Logger.minor(this, "Lost
connection replying to "+m);
}
return true;
- }else if(spec == DMT.FNPLinkPing) {
- long id = m.getLong(DMT.PING_SEQNO);
- Message msg = DMT.createFNPLinkPong(id);
- try {
- source.sendAsync(msg, null, 0, pingCounter);
- } catch (NotConnectedException e) {
- // Ignore
- }
- return true;
} else if (spec == DMT.FNPStoreSecret) {
return node.netid.handleStoreSecret(m);
} else if(spec == DMT.FNPSecretPing) {
