From 93bd1063a403fedfb79e334c5dcb81565afa655d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kjetil=20=C3=98rbekk?= <kjetil.orbekk@gmail.com>
Date: Tue, 14 Feb 2012 11:01:02 +0100
Subject: Network creation and discovery in Android app.

---
 same/src/main/java/com/orbekk/same/Client.java         | 9 +++++++++
 same/src/main/java/com/orbekk/same/Master.java         | 4 ++--
 same/src/main/java/com/orbekk/same/SameController.java | 8 ++++----
 3 files changed, 15 insertions(+), 6 deletions(-)

(limited to 'same/src/main/java')

diff --git a/same/src/main/java/com/orbekk/same/Client.java b/same/src/main/java/com/orbekk/same/Client.java
index 7730f3e..b97ab91 100644
--- a/same/src/main/java/com/orbekk/same/Client.java
+++ b/same/src/main/java/com/orbekk/same/Client.java
@@ -173,6 +173,15 @@ public class Client implements DiscoveryListener {
     
     @Override
     public void discover(String url) {
+        String networkName = state.getDataOf(".networkName");
+        if (networkName.equals(".InvalidClientNetwork")) {
+            logger.warn("Client not joined to a network. Ignoring discovery");
+            return;
+        } else if (networkName.equals(".Private")) {
+            logger.info("Ignoring broadcast to .Private network.");
+            return;
+        }
+        
         if (!url.equals(myUrl)) {
             try {
                 connections.getClient(url)
diff --git a/same/src/main/java/com/orbekk/same/Master.java b/same/src/main/java/com/orbekk/same/Master.java
index eaf0a8f..ed04b4d 100644
--- a/same/src/main/java/com/orbekk/same/Master.java
+++ b/same/src/main/java/com/orbekk/same/Master.java
@@ -18,8 +18,8 @@ public class Master implements MasterService, Runnable {
     private Thread workerThread = null;
     
     public static Master create(ConnectionManager connections,
-            Broadcaster broadcaster, String myUrl) {
-        State state = new State("DefaultMaster");
+            Broadcaster broadcaster, String myUrl, String networkName) {
+        State state = new State(networkName);
         state.update(".masterUrl", myUrl, 1);
         return new Master(state, connections, broadcaster);
     }
diff --git a/same/src/main/java/com/orbekk/same/SameController.java b/same/src/main/java/com/orbekk/same/SameController.java
index d012d64..7f7a5d0 100644
--- a/same/src/main/java/com/orbekk/same/SameController.java
+++ b/same/src/main/java/com/orbekk/same/SameController.java
@@ -34,7 +34,7 @@ public class SameController {
         int port = configuration.getInt("port");
         ConnectionManagerImpl connections = new ConnectionManagerImpl(
                 timeout, timeout);
-        State state = new State("Default");
+        State clientState = new State(".InvalidClientNetwork");
         Broadcaster broadcaster = BroadcasterImpl.getDefaultBroadcastRunner();
         
         String baseUrl = String.format("http://%s:%s/",
@@ -43,10 +43,10 @@ public class SameController {
         String masterUrl = baseUrl + "MasterService.json";
         String clientUrl = baseUrl + "ClientService.json";
         
-        Master master = Master.create(
-                connections, broadcaster, masterUrl);
+        Master master = Master.create(connections, broadcaster,
+                masterUrl, configuration.get("networkName"));
         
-        Client client = new Client(state, connections,
+        Client client = new Client(clientState, connections,
                 clientUrl);
         PaxosServiceImpl paxos = new PaxosServiceImpl("");
         
-- 
cgit v1.2.3