summaryrefslogtreecommitdiff
path: root/jsonrpc/src/main/java/com/orbekk/same/SameState.java
diff options
context:
space:
mode:
authorKjetil Ørbekk <kjetil.orbekk@gmail.com>2012-01-11 12:42:46 +0100
committerKjetil Ørbekk <kjetil.orbekk@gmail.com>2012-01-11 12:42:46 +0100
commit2b1a0ad7d0e2a7766c6c4e4f5f31a08fb8d89d63 (patch)
treef5e183b5e09dc12610f2f8227fb49e8bb15d0a71 /jsonrpc/src/main/java/com/orbekk/same/SameState.java
parenta88ef239b58ba926f9ce29e2b87d636fae18aaf4 (diff)
Add IP discovery.
Before a client wants to join a network, it may send a HTTP "ping" request to a known participant. The participant will send a HTTP "pong" request in response, which informs the client of its IP address. The IP address of a client is automatically retrieved from the first HTTP request received by Jetty.
Diffstat (limited to 'jsonrpc/src/main/java/com/orbekk/same/SameState.java')
-rw-r--r--jsonrpc/src/main/java/com/orbekk/same/SameState.java38
1 files changed, 31 insertions, 7 deletions
diff --git a/jsonrpc/src/main/java/com/orbekk/same/SameState.java b/jsonrpc/src/main/java/com/orbekk/same/SameState.java
index d7dd3dc..c097a0d 100644
--- a/jsonrpc/src/main/java/com/orbekk/same/SameState.java
+++ b/jsonrpc/src/main/java/com/orbekk/same/SameState.java
@@ -10,14 +10,30 @@ import org.slf4j.LoggerFactory;
*
* This class manages the current state of the Same protocol.
*/
-public class SameState extends Thread {
+public class SameState extends Thread implements UrlReceiver {
private Logger logger = LoggerFactory.getLogger(getClass());
private ConnectionManager connections;
private List<String> participants = new LinkedList<String>();
private String currentState = "";
private String networkName;
- // The client id of this participant.
+
+ /**
+ * The client id of this participant.
+ */
private String clientId;
+
+ /**
+ * The URL of this participant.
+ *
+ * Important note: Our URL is unknown initially. Url is null until we
+ * receive our first request. The URL is then taken to be the target URL
+ * from the request.
+ */
+ private String url = null;
+
+ /**
+ * Stopping condition for this thread.
+ */
private boolean stopped = false;
/**
@@ -48,12 +64,20 @@ public class SameState extends Thread {
return currentState;
}
+ public String getUrl() {
+ return url;
+ }
+
+ @Override
+ public void setUrl(String url) {
+ logger.info("My URL is {}", url);
+ this.url = url;
+ }
+
public synchronized void addParticipant(String clientId, String url) {
- synchronized(this) {
- logger.info("Add pending participant: {} ({})", clientId, url);
- pendingParticipants.add(url);
- notifyAll();
- }
+ logger.info("PendingParticipant.add: {} ({})", clientId, url);
+ pendingParticipants.add(url);
+ notifyAll();
}
private synchronized void handleNewParticipants() {