X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fnet%2Fpterodactylus%2Ffcp%2Fhighlevel%2FFcpClient.java;h=71b118e5f51faf2b49b15212603d554f4927101a;hb=9eeeeee78c2b7c3f6e8cda59779f1c9be036357e;hp=78a5064aed0225adc4f6ce47f280231fa4321afb;hpb=b9e631fc3d6577df59d1660dfa37502e0e08de29;p=jFCPlib.git

diff --git a/src/net/pterodactylus/fcp/highlevel/FcpClient.java b/src/net/pterodactylus/fcp/highlevel/FcpClient.java
index 78a5064..71b118e 100644
--- a/src/net/pterodactylus/fcp/highlevel/FcpClient.java
+++ b/src/net/pterodactylus/fcp/highlevel/FcpClient.java
@@ -23,6 +23,7 @@ import java.io.IOException;
 import java.net.InetAddress;
 import java.net.URL;
 import java.net.UnknownHostException;
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.Set;
 import java.util.concurrent.CountDownLatch;
@@ -30,18 +31,22 @@ import java.util.concurrent.CountDownLatch;
 import net.pterodactylus.fcp.AddPeer;
 import net.pterodactylus.fcp.ClientHello;
 import net.pterodactylus.fcp.CloseConnectionDuplicateClientName;
+import net.pterodactylus.fcp.EndListPeerNotes;
 import net.pterodactylus.fcp.EndListPeers;
 import net.pterodactylus.fcp.FcpAdapter;
 import net.pterodactylus.fcp.FcpConnection;
 import net.pterodactylus.fcp.FcpListener;
+import net.pterodactylus.fcp.ListPeerNotes;
 import net.pterodactylus.fcp.ListPeers;
 import net.pterodactylus.fcp.ModifyPeer;
 import net.pterodactylus.fcp.NodeHello;
 import net.pterodactylus.fcp.NodeRef;
 import net.pterodactylus.fcp.Peer;
+import net.pterodactylus.fcp.PeerNote;
 import net.pterodactylus.fcp.PeerRemoved;
 import net.pterodactylus.fcp.ProtocolError;
 import net.pterodactylus.fcp.RemovePeer;
+import net.pterodactylus.util.thread.ObjectWrapper;
 
 /**
  * High-level FCP client that hides the details of the underlying FCP
@@ -142,7 +147,7 @@ public class FcpClient {
 	 *             if an FCP error occurs
 	 */
 	public void connect() throws IOException, FcpException {
-		ExtendedFcpAdapter fcpListener = new ExtendedFcpAdapter() {
+		new ExtendedFcpAdapter() {
 
 			/**
 			 * {@inheritDoc}
@@ -162,8 +167,7 @@ public class FcpClient {
 			public void receivedNodeHello(FcpConnection fcpConnection, NodeHello nodeHello) {
 				completionLatch.countDown();
 			}
-		};
-		fcpListener.execute();
+		}.execute();
 	}
 
 	/**
@@ -183,15 +187,22 @@ public class FcpClient {
 	/**
 	 * Returns all peers that the node has.
 	 *
+	 * @param withMetadata
+	 *            <code>true</code> to include peer metadata
+	 * @param withVolatile
+	 *            <code>true</code> to include volatile peer data
 	 * @return A set containing the node’s peers
 	 * @throws IOException
 	 *             if an I/O error occurs
 	 * @throws FcpException
 	 *             if an FCP error occurs
 	 */
-	public Set<Peer> getPeers() throws IOException, FcpException {
-		final Set<Peer> peers = new HashSet<Peer>();
-		ExtendedFcpAdapter fcpListener = new ExtendedFcpAdapter() {
+	public Set<Peer> getPeers(final boolean withMetadata, final boolean withVolatile) throws IOException, FcpException {
+		final Set<Peer> peers = Collections.synchronizedSet(new HashSet<Peer>());
+		new ExtendedFcpAdapter() {
+
+			/** The ID of the “ListPeers” request. */
+			private String identifier = "list-peers-" + System.currentTimeMillis();
 
 			/**
 			 * {@inheritDoc}
@@ -199,7 +210,7 @@ public class FcpClient {
 			@Override
 			@SuppressWarnings("synthetic-access")
 			public void run() throws IOException {
-				fcpConnection.sendMessage(new ListPeers("list-peers"));
+				fcpConnection.sendMessage(new ListPeers(identifier, withMetadata, withVolatile));
 			}
 
 			/**
@@ -207,7 +218,9 @@ public class FcpClient {
 			 */
 			@Override
 			public void receivedPeer(FcpConnection fcpConnection, Peer peer) {
-				peers.add(peer);
+				if (peer.getIdentifier().equals(identifier)) {
+					peers.add(peer);
+				}
 			}
 
 			/**
@@ -215,10 +228,11 @@ public class FcpClient {
 			 */
 			@Override
 			public void receivedEndListPeers(FcpConnection fcpConnection, EndListPeers endListPeers) {
-				completionLatch.countDown();
+				if (endListPeers.getIdentifier().equals(identifier)) {
+					completionLatch.countDown();
+				}
 			}
-		};
-		fcpListener.execute();
+		}.execute();
 		return peers;
 	}
 
@@ -294,7 +308,7 @@ public class FcpClient {
 	 *             if an FCP error occurs
 	 */
 	private void addPeer(final AddPeer addPeer) throws IOException, FcpException {
-		ExtendedFcpAdapter fcpListener = new ExtendedFcpAdapter() {
+		new ExtendedFcpAdapter() {
 
 			/**
 			 * {@inheritDoc}
@@ -312,8 +326,7 @@ public class FcpClient {
 			public void receivedPeer(FcpConnection fcpConnection, Peer peer) {
 				completionLatch.countDown();
 			}
-		};
-		fcpListener.execute();
+		}.execute();
 	}
 
 	/**
@@ -338,7 +351,7 @@ public class FcpClient {
 	 *             if an FCP error occurs
 	 */
 	public void modifyPeer(final Peer peer, final Boolean allowLocalAddresses, final Boolean disabled, final Boolean listenOnly) throws IOException, FcpException {
-		ExtendedFcpAdapter fcpListener = new ExtendedFcpAdapter() {
+		new ExtendedFcpAdapter() {
 
 			/**
 			 * {@inheritDoc}
@@ -356,8 +369,7 @@ public class FcpClient {
 			public void receivedPeer(FcpConnection fcpConnection, Peer peer) {
 				completionLatch.countDown();
 			}
-		};
-		fcpListener.execute();
+		}.execute();
 	}
 
 	/**
@@ -371,7 +383,7 @@ public class FcpClient {
 	 *             if an FCP error occurs
 	 */
 	public void removePeer(final Peer peer) throws IOException, FcpException {
-		ExtendedFcpAdapter fcpListener = new ExtendedFcpAdapter() {
+		new ExtendedFcpAdapter() {
 
 			/**
 			 * {@inheritDoc}
@@ -389,8 +401,56 @@ public class FcpClient {
 			public void receivedPeerRemoved(FcpConnection fcpConnection, PeerRemoved peerRemoved) {
 				completionLatch.countDown();
 			}
-		};
-		fcpListener.execute();
+		}.execute();
+	}
+
+	//
+	// PEER NOTES MANAGEMENT
+	//
+
+	/**
+	 * Returns the peer note of the given peer.
+	 *
+	 * @param peer
+	 *            The peer to get the note for
+	 * @return The peer’s note
+	 * @throws IOException
+	 *             if an I/O error occurs
+	 * @throws FcpException
+	 *             if an FCP error occurs
+	 */
+	public PeerNote getPeerNote(final Peer peer) throws IOException, FcpException {
+		final ObjectWrapper<PeerNote> objectWrapper = new ObjectWrapper<PeerNote>();
+		new ExtendedFcpAdapter() {
+
+			/**
+			 * {@inheritDoc}
+			 */
+			@Override
+			@SuppressWarnings("synthetic-access")
+			public void run() throws IOException {
+				fcpConnection.sendMessage(new ListPeerNotes(peer.getIdentity()));
+			}
+
+			/**
+			 * {@inheritDoc}
+			 */
+			@Override
+			public void receivedPeerNote(FcpConnection fcpConnection, PeerNote peerNote) {
+				if (peerNote.getNodeIdentifier().equals(peer.getIdentity())) {
+					objectWrapper.set(peerNote);
+				}
+			}
+
+			/**
+			 * {@inheritDoc}
+			 */
+			@Override
+			public void receivedEndListPeerNotes(FcpConnection fcpConnection, EndListPeerNotes endListPeerNotes) {
+				completionLatch.countDown();
+			}
+		}.execute();
+		return objectWrapper.get();
 	}
 
 	/**