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.

1 files changed, 7 insertions, 10 deletions

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);
     }