From 2b1a0ad7d0e2a7766c6c4e4f5f31a08fb8d89d63 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kjetil=20=C3=98rbekk?= <kjetil.orbekk@gmail.com>
Date: Wed, 11 Jan 2012 12:42:46 +0100
Subject: 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.
---
 .../src/main/java/com/orbekk/same/SameServiceImpl.java  | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

(limited to 'jsonrpc/src/main/java/com/orbekk/same/SameServiceImpl.java')

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,20 +6,14 @@ 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);
@@ -27,13 +21,16 @@ public class SameServiceImpl implements SameService, CallerInfoListener {
 
     @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);
     }
-- 
cgit v1.2.3