X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fnet%2Fpterodactylus%2Futil%2Ffcp%2FFcpConnection.java;h=8ea71ee55fff7743852cfd8204d2da2bf65ca953;hb=e98291d3a70d3791b9ed3e87c58e6a45584f1ae2;hp=818025c5f934b3b5e7ba496a5e37effe9fb86856;hpb=4f69b0b7f7dd68527ac69d75c404f85edb116975;p=jSite2.git

diff --git a/src/net/pterodactylus/util/fcp/FcpConnection.java b/src/net/pterodactylus/util/fcp/FcpConnection.java
index 818025c..8ea71ee 100644
--- a/src/net/pterodactylus/util/fcp/FcpConnection.java
+++ b/src/net/pterodactylus/util/fcp/FcpConnection.java
@@ -29,6 +29,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import net.pterodactylus.util.io.Closer;
+import net.pterodactylus.util.io.LimitedInputStream;
 
 /**
  * An FCP connection to a Freenet node.
@@ -209,12 +210,12 @@ public class FcpConnection {
 	/**
 	 * Notifies all listeners that a “PeerNote” message was received.
 	 * 
-	 * @see FcpListener#receviedPeerNote(FcpConnection, PeerNote)
+	 * @see FcpListener#receivedPeerNote(FcpConnection, PeerNote)
 	 * @param peerNote
 	 */
 	private void fireReceivedPeerNote(PeerNote peerNote) {
 		for (FcpListener fcpListener: fcpListeners) {
-			fcpListener.receviedPeerNote(this, peerNote);
+			fcpListener.receivedPeerNote(this, peerNote);
 		}
 	}
 
@@ -235,13 +236,13 @@ public class FcpConnection {
 	/**
 	 * Notifies all listeners that a “PeerRemoved” message was received.
 	 * 
-	 * @see FcpListener#receviedPeerRemoved(FcpConnection, PeerRemoved)
+	 * @see FcpListener#receivedPeerRemoved(FcpConnection, PeerRemoved)
 	 * @param peerRemoved
 	 *            The “PeerRemoved” message
 	 */
 	private void fireReceivedPeerRemoved(PeerRemoved peerRemoved) {
 		for (FcpListener fcpListener: fcpListeners) {
-			fcpListener.receviedPeerRemoved(this, peerRemoved);
+			fcpListener.receivedPeerRemoved(this, peerRemoved);
 		}
 	}
 
@@ -259,6 +260,130 @@ public class FcpConnection {
 	}
 
 	/**
+	 * Notifies all listeners that a “TestDDAReply” message was received.
+	 * 
+	 * @see FcpListener#receivedTestDDAReply(FcpConnection, TestDDAReply)
+	 * @param testDDAReply
+	 *            The “TestDDAReply” message
+	 */
+	private void fireReceivedTestDDAReply(TestDDAReply testDDAReply) {
+		for (FcpListener fcpListener: fcpListeners) {
+			fcpListener.receivedTestDDAReply(this, testDDAReply);
+		}
+	}
+
+	/**
+	 * Notifies all listeners that a “TestDDAComplete” message was received.
+	 * 
+	 * @see FcpListener#receivedTestDDAComplete(FcpConnection, TestDDAComplete)
+	 * @param testDDAComplete
+	 *            The “TestDDAComplete” message
+	 */
+	private void fireReceivedTestDDAComplete(TestDDAComplete testDDAComplete) {
+		for (FcpListener fcpListener: fcpListeners) {
+			fcpListener.receivedTestDDAComplete(this, testDDAComplete);
+		}
+	}
+
+	/**
+	 * Notifies all listeners that a “PersistentPut” message was received.
+	 * 
+	 * @see FcpListener#receivedPersistentPut(FcpConnection, PersistentPut)
+	 * @param persistentPut
+	 *            The “PersistentPut” message
+	 */
+	private void fireReceivedPersistentPut(PersistentPut persistentPut) {
+		for (FcpListener fcpListener: fcpListeners) {
+			fcpListener.receivedPersistentPut(this, persistentPut);
+		}
+	}
+
+	/**
+	 * Notifies all listeners that a “EndListPersistentRequests” message was
+	 * received.
+	 * 
+	 * @param endListPersistentRequests
+	 *            The “EndListPersistentRequests” message
+	 */
+	private void fireReceivedEndListPersistentRequests(EndListPersistentRequests endListPersistentRequests) {
+		for (FcpListener fcpListener: fcpListeners) {
+			fcpListener.receivedEndListPersistentRequests(this, endListPersistentRequests);
+		}
+	}
+
+	/**
+	 * Notifies all listeners that a “URIGenerated” message was received.
+	 * 
+	 * @param uriGenerated
+	 *            The “URIGenerated” message
+	 */
+	private void fireReceivedURIGenerated(URIGenerated uriGenerated) {
+		for (FcpListener fcpListener: fcpListeners) {
+			fcpListener.receivedURIGenerated(this, uriGenerated);
+		}
+	}
+
+	/**
+	 * Notifies all listeners that an “AllData” message was received.
+	 * 
+	 * @param allData
+	 *            The “AllData” message
+	 */
+	private void fireReceivedAllData(AllData allData) {
+		for (FcpListener fcpListener: fcpListeners) {
+			fcpListener.receivedAllData(this, allData);
+		}
+	}
+
+	/**
+	 * Notifies all listeners that a “SimpleProgress” message was received.
+	 * 
+	 * @param simpleProgress
+	 *            The “SimpleProgress” message
+	 */
+	private void fireReceivedSimpleProgress(SimpleProgress simpleProgress) {
+		for (FcpListener fcpListener: fcpListeners) {
+			fcpListener.receivedSimpleProgress(this, simpleProgress);
+		}
+	}
+
+	/**
+	 * Notifies all listeners that a “StartedCompression” message was received.
+	 * 
+	 * @param startedCompression
+	 *            The “StartedCompression” message
+	 */
+	private void fireReceivedStartedCompression(StartedCompression startedCompression) {
+		for (FcpListener fcpListener: fcpListeners) {
+			fcpListener.receivedStartedCompression(this, startedCompression);
+		}
+	}
+
+	/**
+	 * Notifies all listeners that a “FinishedCompression” message was received.
+	 * 
+	 * @param finishedCompression
+	 *            The “FinishedCompression” message
+	 */
+	private void fireReceivedFinishedCompression(FinishedCompression finishedCompression) {
+		for (FcpListener fcpListener: fcpListeners) {
+			fcpListener.receviedFinishedCompression(this, finishedCompression);
+		}
+	}
+
+	/**
+	 * Notifies all listeners that a “ProtocolError” message was received.
+	 * 
+	 * @param protocolError
+	 *            The “ProtocolError” message
+	 */
+	private void fireReceivedProtocolError(ProtocolError protocolError) {
+		for (FcpListener fcpListener: fcpListeners) {
+			fcpListener.receivedProtocolError(this, protocolError);
+		}
+	}
+
+	/**
 	 * Notifies all registered listeners that a message has been received.
 	 * 
 	 * @see FcpListener#receivedMessage(FcpConnection, FcpMessage)
@@ -332,10 +457,39 @@ public class FcpConnection {
 	 */
 	void handleMessage(FcpMessage fcpMessage) {
 		String messageName = fcpMessage.getName();
-		if ("Peer".equals(messageName)) {
+		if ("SimpleProgress".equals(messageName)) {
+			fireReceivedSimpleProgress(new SimpleProgress(fcpMessage));
+		} else if ("ProtocolError".equals(messageName)) {
+			fireReceivedProtocolError(new ProtocolError(fcpMessage));
+		} else if ("PersistentPut".equals(messageName)) {
+			fireReceivedPersistentPut(new PersistentPut(fcpMessage));
+		} else if ("URIGenerated".equals(messageName)) {
+			fireReceivedURIGenerated(new URIGenerated(fcpMessage));
+		} else if ("EndListPersistentRequests".equals(messageName)) {
+			fireReceivedEndListPersistentRequests(new EndListPersistentRequests(fcpMessage));
+		} else if ("Peer".equals(messageName)) {
 			fireReceivedPeer(new Peer(fcpMessage));
 		} else if ("PeerNote".equals(messageName)) {
 			fireReceivedPeerNote(new PeerNote(fcpMessage));
+		} else if ("StartedCompression".equals(messageName)) {
+			fireReceivedStartedCompression(new StartedCompression(fcpMessage));
+		} else if ("FinishedCompression".equals(messageName)) {
+			fireReceivedFinishedCompression(new FinishedCompression(fcpMessage));
+		} else if ("AllData".equals(messageName)) {
+			long dataLength;
+			try {
+				dataLength = Long.valueOf(fcpMessage.getField("DataLength"));
+			} catch (NumberFormatException nfe1) {
+				dataLength = -1;
+			}
+			LimitedInputStream payloadInputStream = new LimitedInputStream(remoteInputStream, dataLength);
+			fireReceivedAllData(new AllData(fcpMessage, payloadInputStream));
+			try {
+				payloadInputStream.consume();
+			} catch (IOException ioe1) {
+				/* FIXME - what now? */
+				/* well, ignore. when the connection handler fails, all fails. */
+			}
 		} else if ("EndListPeerNotes".equals(messageName)) {
 			fireReceivedEndListPeerNotes(new EndListPeerNotes(fcpMessage));
 		} else if ("EndListPeers".equals(messageName)) {
@@ -346,6 +500,10 @@ public class FcpConnection {
 			fireReceivedPeerRemoved(new PeerRemoved(fcpMessage));
 		} else if ("NodeData".equals(messageName)) {
 			fireReceivedNodeData(new NodeData(fcpMessage));
+		} else if ("TestDDAReply".equals(messageName)) {
+			fireReceivedTestDDAReply(new TestDDAReply(fcpMessage));
+		} else if ("TestDDAComplete".equals(messageName)) {
+			fireReceivedTestDDAComplete(new TestDDAComplete(fcpMessage));
 		} else if ("NodeHello".equals(messageName)) {
 			fireReceivedNodeHello(new NodeHello(fcpMessage));
 		} else if ("CloseConnectionDuplicateClientName".equals(messageName)) {