X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fnet%2Fpterodactylus%2Futil%2Ffcp%2FFcpConnection.java;h=ac7bb34aeab79bc06c5c667ea3dd821b49683edb;hb=7cb4b419a0fb39141c6e1bf3807205dcdce2adcc;hp=fa3673d318f62cdc86d87c807c661a446324a4ad;hpb=b27920eb552020751ee19fb3eea3aa08a2ccae5e;p=jSite2.git

diff --git a/src/net/pterodactylus/util/fcp/FcpConnection.java b/src/net/pterodactylus/util/fcp/FcpConnection.java
index fa3673d..ac7bb34 100644
--- a/src/net/pterodactylus/util/fcp/FcpConnection.java
+++ b/src/net/pterodactylus/util/fcp/FcpConnection.java
@@ -500,6 +500,80 @@ public class FcpConnection {
 	}
 
 	/**
+	 * 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 an “FCPPluginReply” message was received.
+	 * 
+	 * @param fcpPluginReply
+	 *            The “FCPPluginReply” message
+	 */
+	private void fireReceivedFCPPluginReply(FCPPluginReply fcpPluginReply) {
+		for (FcpListener fcpListener: fcpListeners) {
+			fcpListener.receivedFCPPluginReply(this, fcpPluginReply);
+		}
+	}
+
+	/**
+	 * Notifies all listeners that a “PersistentRequestModified” message was
+	 * received.
+	 * 
+	 * @param persistentRequestModified
+	 *            The “PersistentRequestModified” message
+	 */
+	private void fireReceivedPersistentRequestModified(PersistentRequestModified persistentRequestModified) {
+		for (FcpListener fcpListener: fcpListeners) {
+			fcpListener.receivedPersistentRequestModified(this, persistentRequestModified);
+		}
+	}
+
+	/**
+	 * Notifies all listeners that a “PutSuccessful” message was received.
+	 * 
+	 * @param putSuccessful
+	 *            The “PutSuccessful” message
+	 */
+	private void fireReceivedPutSuccessful(PutSuccessful putSuccessful) {
+		for (FcpListener fcpListener: fcpListeners) {
+			fcpListener.receivedPutSuccessful(this, putSuccessful);
+		}
+	}
+
+	/**
 	 * Notifies all listeners that a “ProtocolError” message was received.
 	 * 
 	 * @param protocolError
@@ -610,25 +684,22 @@ public class FcpConnection {
 			fireReceivedFinishedCompression(new FinishedCompression(fcpMessage));
 		} else if ("GetFailed".equals(messageName)) {
 			fireReceivedGetFailed(new GetFailed(fcpMessage));
+		} else if ("PutSuccessful".equals(messageName)) {
+			fireReceivedPutSuccessful(new PutSuccessful(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)) {
@@ -639,10 +710,24 @@ public class FcpConnection {
 			fireReceivedSSKKeypair(new SSKKeypair(fcpMessage));
 		} else if ("PeerRemoved".equals(messageName)) {
 			fireReceivedPeerRemoved(new PeerRemoved(fcpMessage));
+		} else if ("PersistentRequestModified".equals(messageName)) {
+			fireReceivedPersistentRequestModified(new PersistentRequestModified(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 ("FCPPluginReply".equals(messageName)) {
+			LimitedInputStream payloadInputStream = getInputStream(FcpUtils.safeParseLong(fcpMessage.getField("DataLength")));
+			fireReceivedFCPPluginReply(new FCPPluginReply(fcpMessage, payloadInputStream));
+			try {
+				payloadInputStream.consume();
+			} catch (IOException ioe1) {
+				/* ignore. */
+			}
+		} else if ("PluginInfo".equals(messageName)) {
+			fireReceivedPluginInfo(new PluginInfo(fcpMessage));
 		} else if ("NodeData".equals(messageName)) {
 			fireReceivedNodeData(new NodeData(fcpMessage));
 		} else if ("TestDDAReply".equals(messageName)) {
@@ -689,4 +774,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);
+	}
+
 }