diff options
author | Kjetil Ørbekk <kjetil.orbekk@gmail.com> | 2012-01-11 12:42:46 +0100 |
---|---|---|
committer | Kjetil Ørbekk <kjetil.orbekk@gmail.com> | 2012-01-11 12:42:46 +0100 |
commit | 2b1a0ad7d0e2a7766c6c4e4f5f31a08fb8d89d63 (patch) | |
tree | f5e183b5e09dc12610f2f8227fb49e8bb15d0a71 /jsonrpc/src/main/java/com/orbekk/same | |
parent | a88ef239b58ba926f9ce29e2b87d636fae18aaf4 (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')
5 files changed, 49 insertions, 34 deletions
diff --git a/jsonrpc/src/main/java/com/orbekk/same/CallerInfoListener.java b/jsonrpc/src/main/java/com/orbekk/same/CallerInfoListener.java deleted file mode 100644 index e3ccfea..0000000 --- a/jsonrpc/src/main/java/com/orbekk/same/CallerInfoListener.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.orbekk.same; - -/** - * An interface to get notified of the current caller. - * - * This interface is needed because jsonrpc4j does not pass the - * HttpServletRequest to the service implementation. - */ -public interface CallerInfoListener { - void setCaller(String callerIp); -} diff --git a/jsonrpc/src/main/java/com/orbekk/same/SameService.java b/jsonrpc/src/main/java/com/orbekk/same/SameService.java index 0a261a8..76e9035 100644 --- a/jsonrpc/src/main/java/com/orbekk/same/SameService.java +++ b/jsonrpc/src/main/java/com/orbekk/same/SameService.java @@ -13,14 +13,9 @@ public interface SameService { /** * A request from the callee to participate in 'networkName'. - * - * A client may not know its URL. If the url parameter is empty, - * use info from the HttpServletRequest. - * - * TODO: Always pass a valid URL and get rid of the port parameter. */ void participateNetwork(String networkName, String clientId, - String url, int remotePort); + String url); /** * Notification of participation in network. diff --git a/jsonrpc/src/main/java/com/orbekk/same/SameServiceImpl.java b/jsonrpc/src/main/java/com/orbekk/same/SameServiceImpl.java index e7484c1..533a055 100644 --- a/jsonrpc/src/main/java/com/orbekk/same/SameServiceImpl.java +++ b/jsonrpc/src/main/java/com/orbekk/same/SameServiceImpl.java @@ -6,34 +6,31 @@ import java.util.LinkedList; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class SameServiceImpl implements SameService, CallerInfoListener { +public class SameServiceImpl implements SameService { private Logger logger = LoggerFactory.getLogger(getClass()); private SameState sameState; - private String currentCallerIp; public SameServiceImpl(SameState sameState) { this.sameState = sameState; } @Override - public void setCaller(String callerIp) { - currentCallerIp = callerIp; - } - - @Override public void notifyNetwork(String networkName) { logger.info("Notification from network " + networkName); } @Override public void participateNetwork(String networkName, String clientId, - String url, int remotePort) { + String url) { if (!networkName.equals(sameState.getNetworkName())) { logger.warn("Client tried to join {}, but network name is {}.", networkName, sameState.getNetworkName()); + return; } - if (url.equals("")) { - url = "http://" + currentCallerIp + ":" + remotePort; + if (clientId.equals("") || url.equals("")) { + logger.warn("Missing client info: ClientId({}), URL({}).", + clientId, url); + return; } sameState.addParticipant(clientId, url); } 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() { diff --git a/jsonrpc/src/main/java/com/orbekk/same/UrlReceiver.java b/jsonrpc/src/main/java/com/orbekk/same/UrlReceiver.java new file mode 100644 index 0000000..31a0276 --- /dev/null +++ b/jsonrpc/src/main/java/com/orbekk/same/UrlReceiver.java @@ -0,0 +1,10 @@ +package com.orbekk.same; + +/** + * An interface to get notified of the URL to this computer. + * + * This interface is used to reliably obtain the URL of this host. + */ +public interface UrlReceiver { + void setUrl(String url); +} |