Author: toad
Date: 2008-04-05 15:32:27 +0000 (Sat, 05 Apr 2008)
New Revision: 19039
Modified:
trunk/freenet/src/freenet/node/fcp/ListPeerMessage.java
trunk/freenet/src/freenet/node/fcp/ListPeerNotesMessage.java
trunk/freenet/src/freenet/node/fcp/ModifyPeer.java
trunk/freenet/src/freenet/node/fcp/ModifyPeerNote.java
trunk/freenet/src/freenet/node/fcp/PeerRemoved.java
trunk/freenet/src/freenet/node/fcp/RemovePeer.java
trunk/freenet/src/freenet/node/fcp/ShutdownMessage.java
trunk/freenet/src/freenet/node/fcp/UnknownNodeIdentifierMessage.java
trunk/freenet/src/freenet/node/fcp/UnknownPeerNoteTypeMessage.java
Log:
Some more Identifier's, including missed Peer-related messages.
Modified: trunk/freenet/src/freenet/node/fcp/ListPeerMessage.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/ListPeerMessage.java 2008-04-05
15:26:51 UTC (rev 19038)
+++ trunk/freenet/src/freenet/node/fcp/ListPeerMessage.java 2008-04-05
15:32:27 UTC (rev 19039)
@@ -38,7 +38,7 @@
}
PeerNode pn = node.getPeerNode(nodeIdentifier);
if(pn == null) {
- FCPMessage msg = new
UnknownNodeIdentifierMessage(nodeIdentifier);
+ FCPMessage msg = new
UnknownNodeIdentifierMessage(nodeIdentifier, identifier);
handler.outputHandler.queue(msg);
return;
}
Modified: trunk/freenet/src/freenet/node/fcp/ListPeerNotesMessage.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/ListPeerNotesMessage.java
2008-04-05 15:26:51 UTC (rev 19038)
+++ trunk/freenet/src/freenet/node/fcp/ListPeerNotesMessage.java
2008-04-05 15:32:27 UTC (rev 19039)
@@ -39,7 +39,7 @@
}
PeerNode pn = node.getPeerNode(nodeIdentifier);
if(pn == null) {
- FCPMessage msg = new
UnknownNodeIdentifierMessage(nodeIdentifier);
+ FCPMessage msg = new
UnknownNodeIdentifierMessage(nodeIdentifier, identifier);
handler.outputHandler.queue(msg);
return;
}
Modified: trunk/freenet/src/freenet/node/fcp/ModifyPeer.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/ModifyPeer.java 2008-04-05 15:26:51 UTC
(rev 19038)
+++ trunk/freenet/src/freenet/node/fcp/ModifyPeer.java 2008-04-05 15:32:27 UTC
(rev 19039)
@@ -40,7 +40,7 @@
}
PeerNode pn = node.getPeerNode(nodeIdentifier);
if(pn == null) {
- FCPMessage msg = new
UnknownNodeIdentifierMessage(nodeIdentifier);
+ FCPMessage msg = new
UnknownNodeIdentifierMessage(nodeIdentifier, identifier);
handler.outputHandler.queue(msg);
return;
}
Modified: trunk/freenet/src/freenet/node/fcp/ModifyPeerNote.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/ModifyPeerNote.java 2008-04-05
15:26:51 UTC (rev 19038)
+++ trunk/freenet/src/freenet/node/fcp/ModifyPeerNote.java 2008-04-05
15:32:27 UTC (rev 19039)
@@ -43,7 +43,7 @@
}
PeerNode pn = node.getPeerNode(nodeIdentifier);
if(pn == null) {
- FCPMessage msg = new
UnknownNodeIdentifierMessage(nodeIdentifier);
+ FCPMessage msg = new
UnknownNodeIdentifierMessage(nodeIdentifier, identifier);
handler.outputHandler.queue(msg);
return;
}
@@ -72,7 +72,7 @@
if(peerNoteType == Node.PEER_NOTE_TYPE_PRIVATE_DARKNET_COMMENT)
{
dpn.setPrivateDarknetCommentNote(noteText);
} else {
- FCPMessage msg = new
UnknownPeerNoteTypeMessage(peerNoteType);
+ FCPMessage msg = new
UnknownPeerNoteTypeMessage(peerNoteType, identifier);
handler.outputHandler.queue(msg);
return;
}
Modified: trunk/freenet/src/freenet/node/fcp/PeerRemoved.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/PeerRemoved.java 2008-04-05 15:26:51 UTC
(rev 19038)
+++ trunk/freenet/src/freenet/node/fcp/PeerRemoved.java 2008-04-05 15:32:27 UTC
(rev 19039)
@@ -11,16 +11,20 @@
static final String name = "PeerRemoved";
final String identity;
final String nodeIdentifier;
+ final String identifier;
- public PeerRemoved(String identity, String nodeIdentifier) {
+ public PeerRemoved(String identity, String nodeIdentifier, String
identifier) {
this.identity = identity;
this.nodeIdentifier = nodeIdentifier;
+ this.identifier = identifier;
}
public SimpleFieldSet getFieldSet() {
SimpleFieldSet fs = new SimpleFieldSet(true);
fs.putSingle("Identity", identity);
fs.putSingle("NodeIdentifier", nodeIdentifier);
+ if(identifier != null)
+ fs.putSingle("Identifier", identifier);
return fs;
}
@@ -30,7 +34,7 @@
public void run(FCPConnectionHandler handler, Node node)
throws MessageInvalidException {
- throw new
MessageInvalidException(ProtocolErrorMessage.INVALID_MESSAGE, "PeerRemoved goes
from server to client not the other way around", null, false);
+ throw new
MessageInvalidException(ProtocolErrorMessage.INVALID_MESSAGE, "PeerRemoved goes
from server to client not the other way around", identifier, false);
}
}
Modified: trunk/freenet/src/freenet/node/fcp/RemovePeer.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/RemovePeer.java 2008-04-05 15:26:51 UTC
(rev 19038)
+++ trunk/freenet/src/freenet/node/fcp/RemovePeer.java 2008-04-05 15:32:27 UTC
(rev 19039)
@@ -12,9 +12,12 @@
static final String NAME = "RemovePeer";
final SimpleFieldSet fs;
+ final String identifier;
public RemovePeer(SimpleFieldSet fs) {
this.fs = fs;
+ identifier = fs.get("Identifier");
+ fs.removeValue("Identifier");
}
public SimpleFieldSet getFieldSet() {
@@ -27,21 +30,21 @@
public void run(FCPConnectionHandler handler, Node node) throws
MessageInvalidException {
if(!handler.hasFullAccess()) {
- throw new
MessageInvalidException(ProtocolErrorMessage.ACCESS_DENIED, NAME + " requires
full access", null, false);
+ throw new
MessageInvalidException(ProtocolErrorMessage.ACCESS_DENIED, NAME + " requires
full access", identifier, false);
}
String nodeIdentifier = fs.get("NodeIdentifier");
if( nodeIdentifier == null ) {
- throw new
MessageInvalidException(ProtocolErrorMessage.MISSING_FIELD, "Error:
NodeIdentifier field missing", null, false);
+ throw new
MessageInvalidException(ProtocolErrorMessage.MISSING_FIELD, "Error:
NodeIdentifier field missing", identifier, false);
}
PeerNode pn = node.getPeerNode(nodeIdentifier);
if(pn == null) {
- FCPMessage msg = new
UnknownNodeIdentifierMessage(nodeIdentifier);
+ FCPMessage msg = new
UnknownNodeIdentifierMessage(nodeIdentifier, identifier);
handler.outputHandler.queue(msg);
return;
}
String identity = pn.getIdentityString();
node.removePeerConnection(pn);
- handler.outputHandler.queue(new PeerRemoved(identity,
nodeIdentifier));
+ handler.outputHandler.queue(new PeerRemoved(identity,
nodeIdentifier, identifier));
}
}
Modified: trunk/freenet/src/freenet/node/fcp/ShutdownMessage.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/ShutdownMessage.java 2008-04-05
15:26:51 UTC (rev 19038)
+++ trunk/freenet/src/freenet/node/fcp/ShutdownMessage.java 2008-04-05
15:32:27 UTC (rev 19039)
@@ -9,6 +9,7 @@
public class ShutdownMessage extends FCPMessage{
public final static String NAME = "Shutdown";
+ // No point having an Identifier really...?
public ShutdownMessage() throws MessageInvalidException {
}
Modified: trunk/freenet/src/freenet/node/fcp/UnknownNodeIdentifierMessage.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/UnknownNodeIdentifierMessage.java
2008-04-05 15:26:51 UTC (rev 19038)
+++ trunk/freenet/src/freenet/node/fcp/UnknownNodeIdentifierMessage.java
2008-04-05 15:32:27 UTC (rev 19039)
@@ -9,14 +9,18 @@
public class UnknownNodeIdentifierMessage extends FCPMessage {
final String nodeIdentifier;
+ final String identifier;
- public UnknownNodeIdentifierMessage(String id) {
+ public UnknownNodeIdentifierMessage(String id, String identifier) {
this.nodeIdentifier = id;
+ this.identifier = identifier;
}
public SimpleFieldSet getFieldSet() {
SimpleFieldSet sfs = new SimpleFieldSet(true);
sfs.putSingle("NodeIdentifier", nodeIdentifier);
+ if(identifier != null)
+ sfs.putSingle("Identifier", identifier);
return sfs;
}
Modified: trunk/freenet/src/freenet/node/fcp/UnknownPeerNoteTypeMessage.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/UnknownPeerNoteTypeMessage.java
2008-04-05 15:26:51 UTC (rev 19038)
+++ trunk/freenet/src/freenet/node/fcp/UnknownPeerNoteTypeMessage.java
2008-04-05 15:32:27 UTC (rev 19039)
@@ -9,14 +9,18 @@
public class UnknownPeerNoteTypeMessage extends FCPMessage {
final int peerNoteType;
+ final String identifier;
- public UnknownPeerNoteTypeMessage(int peerNoteType) {
+ public UnknownPeerNoteTypeMessage(int peerNoteType, String identifier) {
this.peerNoteType = peerNoteType;
+ this.identifier = identifier;
}
public SimpleFieldSet getFieldSet() {
SimpleFieldSet fs = new SimpleFieldSet(true);
fs.put("PeerNoteType", peerNoteType);
+ if(identifier != null)
+ fs.putSingle("Identifier", identifier);
return fs;
}
@@ -26,7 +30,7 @@
public void run(FCPConnectionHandler handler, Node node)
throws MessageInvalidException {
- throw new
MessageInvalidException(ProtocolErrorMessage.INVALID_MESSAGE,
"UnknownPeerNoteType goes from server to client not the other way around",
null, false);
+ throw new
MessageInvalidException(ProtocolErrorMessage.INVALID_MESSAGE,
"UnknownPeerNoteType goes from server to client not the other way around",
identifier, false);
}
}
