X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fnet%2Fpterodactylus%2Futil%2Ffcp%2FFcpConnection.java;h=12d52af112c0cfe360984762cf256a2bc98e1655;hb=561d15670607ad2fae532e71dfc25b35848f0775;hp=6c6f99164af7dc578835c11bb5ff4f6d8b785692;hpb=d7f7cfadd5d74daecbfe5ab83aab79f3e01f9d0e;p=jSite2.git

diff --git a/src/net/pterodactylus/util/fcp/FcpConnection.java b/src/net/pterodactylus/util/fcp/FcpConnection.java
index 6c6f991..12d52af 100644
--- a/src/net/pterodactylus/util/fcp/FcpConnection.java
+++ b/src/net/pterodactylus/util/fcp/FcpConnection.java
@@ -456,13 +456,87 @@ public class FcpConnection {
 	 * @param getFailed
 	 *            The “GetFailed” message
 	 */
-	public void fireReceivedGetFailed(GetFailed getFailed) {
+	private void fireReceivedGetFailed(GetFailed getFailed) {
 		for (FcpListener fcpListener: fcpListeners) {
 			fcpListener.receivedGetFailed(this, getFailed);
 		}
 	}
 
 	/**
+	 * Notifies all listeners that a “PutFailed” message was received.
+	 * 
+	 * @param putFailed
+	 *            The “PutFailed” message
+	 */
+	private void fireReceivedPutFailed(PutFailed putFailed) {
+		for (FcpListener fcpListener: fcpListeners) {
+			fcpListener.receivedPutFailed(this, putFailed);
+		}
+	}
+
+	/**
+	 * Notifies all listeners that an “IdentifierCollision” message was
+	 * received.
+	 * 
+	 * @param identifierCollision
+	 *            The “IdentifierCollision” message
+	 */
+	private void fireReceivedIdentifierCollision(IdentifierCollision identifierCollision) {
+		for (FcpListener fcpListener: fcpListeners) {
+			fcpListener.receivedIdentifierCollision(this, identifierCollision);
+		}
+	}
+
+	/**
+	 * Notifies all listeners that an “PersistentPutDir” message was received.
+	 * 
+	 * @param persistentPutDir
+	 *            The “PersistentPutDir” message
+	 */
+	private void fireReceivedPersistentPutDir(PersistentPutDir persistentPutDir) {
+		for (FcpListener fcpListener: fcpListeners) {
+			fcpListener.receivedPersistentPutDir(this, persistentPutDir);
+		}
+	}
+
+	/**
+	 * Notifies all listeners that a “PersistentRequestRemoved” message was
+	 * received.
+	 * 
+	 * @param persistentRequestRemoved
+	 *            The “PersistentRequestRemoved” message
+	 */
+	private void fireReceivedPersistentRequestRemoved(PersistentRequestRemoved persistentRequestRemoved) {
+		for (FcpListener fcpListener: fcpListeners) {
+			fcpListener.receivedPersistentRequestRemoved(this, persistentRequestRemoved);
+		}
+	}
+
+	/**
+	 * Notifies all listeners that a “SubscribedUSKUpdate” message was received.
+	 * 
+	 * @param subscribedUSKUpdate
+	 *            The “SubscribedUSKUpdate” message
+	 */
+	private void fireReceivedSubscribedUSKUpdate(SubscribedUSKUpdate subscribedUSKUpdate) {
+		for (FcpListener fcpListener: fcpListeners) {
+			fcpListener.receivedSubscribedUSKUpdate(this, subscribedUSKUpdate);
+		}
+	}
+
+	/**
+	 * Notifies all listeners that a “PluginInfo” message was received.
+	 * 
+	 * @param pluginInfo
+	 *            The “PluginInfo” message
+	 */
+	private void fireReceivedPluginInfo(PluginInfo pluginInfo) {
+		for (FcpListener fcpListener: fcpListeners) {
+			fcpListener.receivedPluginInfo(this, pluginInfo);
+		}
+	}
+
+	/**
 	 * Notifies all listeners that a “ProtocolError” message was received.
 	 * 
 	 * @param protocolError
@@ -557,6 +631,8 @@ public class FcpConnection {
 			fireReceivedPersistentGet(new PersistentGet(fcpMessage));
 		} else if ("PersistentPut".equals(messageName)) {
 			fireReceivedPersistentPut(new PersistentPut(fcpMessage));
+		} else if ("PersistentPutDir".equals(messageName)) {
+			fireReceivedPersistentPutDir(new PersistentPutDir(fcpMessage));
 		} else if ("URIGenerated".equals(messageName)) {
 			fireReceivedURIGenerated(new URIGenerated(fcpMessage));
 		} else if ("EndListPersistentRequests".equals(messageName)) {
@@ -571,21 +647,20 @@ public class FcpConnection {
 			fireReceivedFinishedCompression(new FinishedCompression(fcpMessage));
 		} else if ("GetFailed".equals(messageName)) {
 			fireReceivedGetFailed(new GetFailed(fcpMessage));
+		} else if ("PutFailed".equals(messageName)) {
+			fireReceivedPutFailed(new PutFailed(fcpMessage));
 		} else if ("DataFound".equals(messageName)) {
 			fireReceivedDataFound(new DataFound(fcpMessage));
+		} else if ("SubscribedUSKUpdate".equals(messageName)) {
+			fireReceivedSubscribedUSKUpdate(new SubscribedUSKUpdate(fcpMessage));
+		} else if ("IdentifierCollision".equals(messageName)) {
+			fireReceivedIdentifierCollision(new IdentifierCollision(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);
+			LimitedInputStream payloadInputStream = getInputStream(FcpUtils.safeParseLong(fcpMessage.getField("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)) {
@@ -596,10 +671,14 @@ public class FcpConnection {
 			fireReceivedSSKKeypair(new SSKKeypair(fcpMessage));
 		} else if ("PeerRemoved".equals(messageName)) {
 			fireReceivedPeerRemoved(new PeerRemoved(fcpMessage));
+		} else if ("PersistentRequestRemoved".equals(messageName)) {
+			fireReceivedPersistentRequestRemoved(new PersistentRequestRemoved(fcpMessage));
 		} else if ("UnknownPeerNoteType".equals(messageName)) {
 			fireReceivedUnknownPeerNoteType(new UnknownPeerNoteType(fcpMessage));
 		} else if ("UnknownNodeIdentifier".equals(messageName)) {
 			fireReceivedUnknownNodeIdentifier(new UnknownNodeIdentifier(fcpMessage));
+		} else if ("PluginInfo".equals(messageName)) {
+			fireReceivedPluginInfo(new PluginInfo(fcpMessage));
 		} else if ("NodeData".equals(messageName)) {
 			fireReceivedNodeData(new NodeData(fcpMessage));
 		} else if ("TestDDAReply".equals(messageName)) {
@@ -646,4 +725,18 @@ public class FcpConnection {
 		incomingMessageStatistics.put(name, oldValue + 1);
 	}
 
+	/**
+	 * Returns a limited input stream from the node’s input stream.
+	 * 
+	 * @param dataLength
+	 *            The length of the stream
+	 * @return The limited input stream
+	 */
+	private LimitedInputStream getInputStream(long dataLength) {
+		if (dataLength <= 0) {
+			return new LimitedInputStream(null, 0);
+		}
+		return new LimitedInputStream(remoteInputStream, dataLength);
+	}
+
 }