X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fnet%2Fpterodactylus%2Futil%2Ffcp%2FFcpConnection.java;h=dabb542618ad3a3c3a2b465ecedbe5d6217e7f91;hb=59ca7b4d7186dd08109ca405c897cb2a980b9935;hp=a8b6024213c97314b2792951e79f42ed8be7b56b;hpb=a1d90ea4e35f7f4f03b352216a1fca37c8e99037;p=jSite2.git

diff --git a/src/net/pterodactylus/util/fcp/FcpConnection.java b/src/net/pterodactylus/util/fcp/FcpConnection.java
index a8b6024..dabb542 100644
--- a/src/net/pterodactylus/util/fcp/FcpConnection.java
+++ b/src/net/pterodactylus/util/fcp/FcpConnection.java
@@ -28,13 +28,6 @@ import java.net.UnknownHostException;
 import java.util.ArrayList;
 import java.util.List;
 
-import net.pterodactylus.util.fcp.message.CloseConnectionDuplicateClientName;
-import net.pterodactylus.util.fcp.message.EndListPeerNotes;
-import net.pterodactylus.util.fcp.message.EndListPeers;
-import net.pterodactylus.util.fcp.message.NodeHello;
-import net.pterodactylus.util.fcp.message.Peer;
-import net.pterodactylus.util.fcp.message.PeerNote;
-import net.pterodactylus.util.fcp.message.SSKKeypair;
 import net.pterodactylus.util.io.Closer;
 
 /**
@@ -216,12 +209,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);
 		}
 	}
 
@@ -240,6 +233,68 @@ public class FcpConnection {
 	}
 
 	/**
+	 * Notifies all listeners that a “PeerRemoved” message was received.
+	 * 
+	 * @see FcpListener#receivedPeerRemoved(FcpConnection, PeerRemoved)
+	 * @param peerRemoved
+	 *            The “PeerRemoved” message
+	 */
+	private void fireReceivedPeerRemoved(PeerRemoved peerRemoved) {
+		for (FcpListener fcpListener: fcpListeners) {
+			fcpListener.receivedPeerRemoved(this, peerRemoved);
+		}
+	}
+
+	/**
+	 * Notifies all listeners that a “NodeData” message was received.
+	 * 
+	 * @see FcpListener#receivedNodeData(FcpConnection, NodeData)
+	 * @param nodeData
+	 *            The “NodeData” message
+	 */
+	private void fireReceivedNodeData(NodeData nodeData) {
+		for (FcpListener fcpListener: fcpListeners) {
+			fcpListener.receivedNodeData(this, nodeData);
+		}
+	}
+
+	/**
+	 * Notifies all listeners that a “TestDDAReply” message was received.
+	 * 
+	 * @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.
+	 * 
+	 * @param testDDAComplete
+	 *            The “TestDDAComplete” message
+	 */
+	private void fireReceivedTestDDAComplete(TestDDAComplete testDDAComplete) {
+		for (FcpListener fcpListener: fcpListeners) {
+			fcpListener.receivedTestDDAComplete(this, testDDAComplete);
+		}
+	}
+
+	/**
+	 * 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)
@@ -313,7 +368,9 @@ public class FcpConnection {
 	 */
 	void handleMessage(FcpMessage fcpMessage) {
 		String messageName = fcpMessage.getName();
-		if ("Peer".equals(messageName)) {
+		if ("ProtocolError".equals(messageName)) {
+			fireReceivedProtocolError(new ProtocolError(fcpMessage));
+		} else if ("Peer".equals(messageName)) {
 			fireReceivedPeer(new Peer(fcpMessage));
 		} else if ("PeerNote".equals(messageName)) {
 			fireReceivedPeerNote(new PeerNote(fcpMessage));
@@ -323,6 +380,14 @@ public class FcpConnection {
 			fireReceivedEndListPeers(new EndListPeers(fcpMessage));
 		} else if ("SSKKeypair".equals(messageName)) {
 			fireReceivedSSKKeypair(new SSKKeypair(fcpMessage));
+		} else if ("PeerRemoved".equals(messageName)) {
+			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)) {