X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fnet%2Fpterodactylus%2Ffcp%2Fhighlevel%2FFcpClient.java;h=2bdcf73ce8c947c39cc7ea4837e2a32df6e3aa4b;hb=af286d4d2254fe092f2f5170183575a89b95f307;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..2bdcf73 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,25 @@ 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.GenerateSSK;
+import net.pterodactylus.fcp.ListPeerNotes;
import net.pterodactylus.fcp.ListPeers;
import net.pterodactylus.fcp.ModifyPeer;
+import net.pterodactylus.fcp.ModifyPeerNote;
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.fcp.SSKKeypair;
+import net.pterodactylus.util.thread.ObjectWrapper;
/**
* High-level FCP client that hides the details of the underlying FCP
@@ -142,7 +150,7 @@ public class FcpClient {
* if an FCP error occurs
*/
public void connect() throws IOException, FcpException {
- ExtendedFcpAdapter fcpListener = new ExtendedFcpAdapter() {
+ new ExtendedFcpAdapter() {
/**
* {@inheritDoc}
@@ -162,8 +170,7 @@ public class FcpClient {
public void receivedNodeHello(FcpConnection fcpConnection, NodeHello nodeHello) {
completionLatch.countDown();
}
- };
- fcpListener.execute();
+ }.execute();
}
/**
@@ -183,15 +190,22 @@ public class FcpClient {
/**
* Returns all peers that the node has.
*
+ * @param withMetadata
+ * true
to include peer metadata
+ * @param withVolatile
+ * true
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 getPeers() throws IOException, FcpException {
- final Set peers = new HashSet();
- ExtendedFcpAdapter fcpListener = new ExtendedFcpAdapter() {
+ public Set getPeers(final boolean withMetadata, final boolean withVolatile) throws IOException, FcpException {
+ final Set peers = Collections.synchronizedSet(new HashSet());
+ new ExtendedFcpAdapter() {
+
+ /** The ID of the âListPeersâ request. */
+ private String identifier = "list-peers-" + System.currentTimeMillis();
/**
* {@inheritDoc}
@@ -199,7 +213,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 +221,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 +231,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 +311,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 +329,7 @@ public class FcpClient {
public void receivedPeer(FcpConnection fcpConnection, Peer peer) {
completionLatch.countDown();
}
- };
- fcpListener.execute();
+ }.execute();
}
/**
@@ -338,7 +354,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 +372,7 @@ public class FcpClient {
public void receivedPeer(FcpConnection fcpConnection, Peer peer) {
completionLatch.countDown();
}
- };
- fcpListener.execute();
+ }.execute();
}
/**
@@ -371,7 +386,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 +404,133 @@ 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 objectWrapper = new ObjectWrapper();
+ 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();
+ }
+
+ /**
+ * Replaces the peer note for the given peer.
+ *
+ * @param peer
+ * The peer
+ * @param noteText
+ * The new base64-encoded note text
+ * @param noteType
+ * The type of the note (currently only 1
is
+ * allowed)
+ * @throws IOException
+ * if an I/O error occurs
+ * @throws FcpException
+ * if an FCP error occurs
+ */
+ public void modifyPeerNote(final Peer peer, final String noteText, final int noteType) throws IOException, FcpException {
+ new ExtendedFcpAdapter() {
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ @SuppressWarnings("synthetic-access")
+ public void run() throws IOException {
+ fcpConnection.sendMessage(new ModifyPeerNote(peer.getIdentity(), noteText, noteType));
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public void receivedPeer(FcpConnection fcpConnection, Peer receivedPeer) {
+ if (receivedPeer.getIdentity().equals(peer.getIdentity())) {
+ completionLatch.countDown();
+ }
+ }
+ }.execute();
+ }
+
+ //
+ // KEY GENERATION
+ //
+
+ /**
+ * Generates a new SSK key pair.
+ *
+ * @return The generated key pair
+ * @throws IOException
+ * if an I/O error occurs
+ * @throws FcpException
+ * if an FCP error occurs
+ */
+ public SSKKeypair generateKeyPair() throws IOException, FcpException {
+ final ObjectWrapper sskKeypairWrapper = new ObjectWrapper();
+ new ExtendedFcpAdapter() {
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ @SuppressWarnings("synthetic-access")
+ public void run() throws IOException {
+ fcpConnection.sendMessage(new GenerateSSK());
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public void receivedSSKKeypair(FcpConnection fcpConnection, SSKKeypair sskKeypair) {
+ sskKeypairWrapper.set(sskKeypair);
+ completionLatch.countDown();
+ }
+ }.execute();
+ return sskKeypairWrapper.get();
}
/**