Reorganised Guice modules. Contribute entropy to pool on Linux/Android.

briar-core/src/org/briarproject/system/LinuxSeedProvider.java

@@ -0,0 +1,69 @@
+package org.briarproject.system;
+
+import static java.util.logging.Level.WARNING;
+
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.net.InetAddress;
+import java.net.NetworkInterface;
+import java.util.Collections;
+import java.util.List;
+import java.util.logging.Logger;
+
+import org.briarproject.api.system.SeedProvider;
+
+class LinuxSeedProvider implements SeedProvider {
+
+	private static final Logger LOG =
+			Logger.getLogger(LinuxSeedProvider.class.getName());
+
+	private final String outputFile, inputFile;
+
+	LinuxSeedProvider() {
+		this("/dev/urandom", "/dev/urandom");
+	}
+
+	LinuxSeedProvider(String outputFile, String inputFile) {
+		this.outputFile = outputFile;
+		this.inputFile = inputFile;
+	}
+
+	public byte[] getSeed() {
+		byte[] seed = new byte[SEED_BYTES];
+		// Contribute whatever slightly unpredictable info we have to the pool
+		try {
+			DataOutputStream out = new DataOutputStream(
+					new FileOutputStream(outputFile));
+			writeToEntropyPool(out);
+			out.flush();
+			out.close();
+		} catch(IOException e) {
+			// On some devices /dev/urandom isn't writable - this isn't fatal
+			if(LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
+		}
+		// Read the seed from the pool
+		try {
+			DataInputStream in =  new DataInputStream(
+					new FileInputStream(inputFile));
+			in.readFully(seed);
+			in.close();
+		} catch(IOException e) {
+			throw new RuntimeException(e);
+		}
+		return seed;
+	}
+
+	void writeToEntropyPool(DataOutputStream out) throws IOException {
+		out.writeLong(System.currentTimeMillis());
+		out.writeLong(System.nanoTime());
+		List<NetworkInterface> ifaces =
+				Collections.list(NetworkInterface.getNetworkInterfaces());
+		for(NetworkInterface i : ifaces) {
+			List<InetAddress> addrs = Collections.list(i.getInetAddresses());
+			for(InetAddress a : addrs) out.write(a.getAddress());
+		}
+	}
+}

briar-core/src/org/briarproject/system/SystemClock.java

@@ -0,0 +1,15 @@
+package org.briarproject.system;
+
+import org.briarproject.api.system.Clock;
+
+/** Default clock implementation. */
+public class SystemClock implements Clock {
+
+	public long currentTimeMillis() {
+		return System.currentTimeMillis();
+	}
+
+	public void sleep(long milliseconds) throws InterruptedException {
+		Thread.sleep(milliseconds);
+	}
+}

briar-core/src/org/briarproject/system/SystemModule.java

@@ -1,16 +0,0 @@
-package org.briarproject.system;
-
-import org.briarproject.api.system.Clock;
-import org.briarproject.api.system.SystemClock;
-import org.briarproject.api.system.SystemTimer;
-import org.briarproject.api.system.Timer;
-
-import com.google.inject.AbstractModule;
-
-public class SystemModule extends AbstractModule {
-
-	protected void configure() {
-		bind(Clock.class).to(SystemClock.class);
-		bind(Timer.class).to(SystemTimer.class);
-	}
-}

briar-core/src/org/briarproject/system/SystemTimer.java

@@ -0,0 +1,31 @@
+package org.briarproject.system;
+
+import java.util.TimerTask;
+
+import org.briarproject.api.system.Timer;
+
+/** Default timer implementation. */
+public class SystemTimer implements Timer {
+
+	private final java.util.Timer timer = new java.util.Timer();
+
+	public void cancel() {
+		timer.cancel();
+	}
+
+	public int purge() {
+		return timer.purge();
+	}
+
+	public void schedule(TimerTask task, long delay) {
+		timer.schedule(task, delay);
+	}
+
+	public void schedule(TimerTask task, long delay, long period) {
+		timer.schedule(task, delay, period);
+	}
+
+	public void scheduleAtFixedRate(TimerTask task, long delay, long period) {
+		timer.scheduleAtFixedRate(task, delay, period);
+	}
+}