X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Ffcp%2FFcpInterface.java;h=e49537bb84bfde30c50b05592e53cc8192dfd31d;hb=5378059868b6681028a0e3dd3b58bff09fe8211a;hp=c71fd82a003b37cc2f4a0897d077911237f3f312;hpb=b343a185e8b89ea5973bf57ec74217652834f5ea;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/fcp/FcpInterface.java b/src/main/java/net/pterodactylus/sone/fcp/FcpInterface.java
index c71fd82..e49537b 100644
--- a/src/main/java/net/pterodactylus/sone/fcp/FcpInterface.java
+++ b/src/main/java/net/pterodactylus/sone/fcp/FcpInterface.java
@@ -22,6 +22,7 @@ import static com.google.common.base.Preconditions.checkNotNull;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -41,6 +42,7 @@ import freenet.support.api.Bucket;
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.inject.Inject;
+import com.google.inject.Singleton;
 
 /**
  * Implementation of an FCP interface for other clients or plugins to
@@ -48,6 +50,7 @@ import com.google.inject.Inject;
  *
  * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
  */
+@Singleton
 public class FcpInterface {
 
 	/**
@@ -72,7 +75,7 @@ public class FcpInterface {
 	private static final Logger logger = Logging.getLogger(FcpInterface.class);
 
 	/** Whether the FCP interface is currently active. */
-	private volatile boolean active;
+	private final AtomicBoolean active = new AtomicBoolean();
 
 	/** What function full access is required for. */
 	private volatile FullAccessRequired fullAccessRequired = FullAccessRequired.ALWAYS;
@@ -111,7 +114,7 @@ public class FcpInterface {
 
 	@VisibleForTesting
 	boolean isActive() {
-		return active;
+		return active.get();
 	}
 
 	/**
@@ -123,7 +126,12 @@ public class FcpInterface {
 	 *            deactivate the FCP interface
 	 */
 	public void setActive(boolean active) {
-		this.active = active;
+		this.active.set(active);
+	}
+
+	@VisibleForTesting
+	FullAccessRequired getFullAccessRequired() {
+		return fullAccessRequired;
 	}
 
 	/**
@@ -155,7 +163,7 @@ public class FcpInterface {
 	 *            {@link FredPluginFCP#ACCESS_FCP_RESTRICTED}
 	 */
 	public void handle(PluginReplySender pluginReplySender, SimpleFieldSet parameters, Bucket data, int accessType) {
-		if (!active) {
+		if (!active.get()) {
 			try {
 				sendReply(pluginReplySender, null, new ErrorResponse(400, "FCP Interface deactivated"));
 			} catch (PluginNotFoundException pnfe1) {
@@ -233,4 +241,13 @@ public class FcpInterface {
 
 	}
 
+	public class SetFullAccessRequired implements OptionWatcher<Integer> {
+
+		@Override
+		public void optionChanged(Option<Integer> option, Integer oldValue, Integer newValue) {
+			setFullAccessRequired(FullAccessRequired.values()[newValue]);
+		}
+
+	}
+
 }