Author: toad
Date: 2007-06-01 18:25:12 +0000 (Fri, 01 Jun 2007)
New Revision: 13451
Modified:
trunk/freenet/src/freenet/node/Node.java
trunk/freenet/src/freenet/node/PeerNode.java
Log:
Bugfixes, not there yet...
Modified: trunk/freenet/src/freenet/node/Node.java
===================================================================
--- trunk/freenet/src/freenet/node/Node.java 2007-06-01 17:43:25 UTC (rev
13450)
+++ trunk/freenet/src/freenet/node/Node.java 2007-06-01 18:25:12 UTC (rev
13451)
@@ -422,7 +422,7 @@
/** Identifier within fproxy messages for an offer to transfer a file */
public static final int N2N_TEXT_MESSAGE_TYPE_FILE_OFFER = 2;
/** Identifier within fproxy messages for accepting an offer to
transfer a file */
- public static final int N2N_TEXT_MESSAGE_TYPE_FILE_OFFER_ACCEPTED = 2;
+ public static final int N2N_TEXT_MESSAGE_TYPE_FILE_OFFER_ACCEPTED = 3;
public static final int EXTRA_PEER_DATA_TYPE_N2NTM = 1;
public static final int EXTRA_PEER_DATA_TYPE_PEER_NOTE = 2;
public static final int EXTRA_PEER_DATA_TYPE_QUEUED_TO_SEND_N2NTM = 3;
@@ -2628,10 +2628,10 @@
Logger.error(this, "IOException while parsing node to
node message data", e);
return;
}
- if(fs.get("type") != null) {
- fs.removeValue("type");
+ if(fs.get("n2nType") != null) {
+ fs.removeValue("n2nType");
}
- fs.putOverwrite("type", Integer.toString(type));
+ fs.putOverwrite("n2nType", Integer.toString(type));
if(fs.get("receivedTime") != null) {
fs.removeValue("receivedTime");
}
@@ -2661,7 +2661,10 @@
* @throws FSParseException
*/
public void handleNodeToNodeTextMessageSimpleFieldSet(SimpleFieldSet
fs, PeerNode source, int fileNumber) throws FSParseException {
+ if(logMINOR)
+ Logger.minor(this, "Got node to node message: \n"+fs);
int overallType = fs.getInt("n2nType", 1); // FIXME remove default
+ fs.removeValue("n2nType");
if(overallType == Node.N2N_MESSAGE_TYPE_FPROXY) {
handleFproxyNodeToNodeTextMessageSimpleFieldSet(fs, source,
fileNumber);
} else {
Modified: trunk/freenet/src/freenet/node/PeerNode.java
===================================================================
--- trunk/freenet/src/freenet/node/PeerNode.java 2007-06-01 17:43:25 UTC
(rev 13450)
+++ trunk/freenet/src/freenet/node/PeerNode.java 2007-06-01 18:25:12 UTC
(rev 13451)
@@ -3319,6 +3319,8 @@
fs.put("composedTime", now);
fs.put("sentTime", now);
fs.put("uid", uid);
+ if(logMINOR)
+ Logger.minor(this, "Sending node to node
message (file offer accepted):\n"+fs);
Message n2ntm;
n2ntm = DMT.createNodeToNodeMessage(
Node.N2N_MESSAGE_TYPE_FPROXY, fs
@@ -3358,6 +3360,8 @@
fs.put("composedTime", now);
fs.put("sentTime", now);
fo.toFieldSet(fs);
+ if(logMINOR)
+ Logger.minor(this, "Sending node to node
message (file offer):\n"+fs);
Message n2ntm;
int status = getPeerNodeStatus();
n2ntm = DMT.createNodeToNodeMessage(
