From 52f98723caa80bf9adabacc5eefdc4c1f188ae4b Mon Sep 17 00:00:00 2001 From: thilan7 Date: Fri, 7 Dec 2018 13:36:51 +0530 Subject: [PATCH] adding new neighbours into routing table --- flood/src/main/java/com/dsvl/flood/Node.java | 8 -------- flood/src/main/java/com/dsvl/flood/UdpServer.java | 6 +++--- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/flood/src/main/java/com/dsvl/flood/Node.java b/flood/src/main/java/com/dsvl/flood/Node.java index c4849f4..5ca161d 100644 --- a/flood/src/main/java/com/dsvl/flood/Node.java +++ b/flood/src/main/java/com/dsvl/flood/Node.java @@ -252,14 +252,6 @@ public void sendPingMessage() { public List search(MessageObject msgObject) { List results = searchInLocalStore(msgObject.getFile_name()); //TODO: get fixed hop count from property file - //if (nodeAddress.equals(msgObject.getSearch_ip()) && getNodeUdpPort() == msgObject.getSearch_udp_Port()) { - // results.forEach(file -> { - // Result result = new Result(file.getFileName(), getNodeAddress() + ":" + getTcpPort() + "/file/" + file.getFileName(), msgObject.getHops()); - // - // Node.latestSearchResults.add(result); - // }); - //} - msgObject.setHops(msgObject.getHops() - 1); if (msgObject.getHops() > 0) { diff --git a/flood/src/main/java/com/dsvl/flood/UdpServer.java b/flood/src/main/java/com/dsvl/flood/UdpServer.java index ea9d016..cb80c56 100644 --- a/flood/src/main/java/com/dsvl/flood/UdpServer.java +++ b/flood/src/main/java/com/dsvl/flood/UdpServer.java @@ -256,13 +256,13 @@ private void respond(MessageObject msgObject, InetAddress senderIP, int senderPo count+=1; } } - if(count==node.getNeighbours().size()){ + if(count==node.getNeighbours().size() && !i.getIpAddress().getHostName().equals(node.getNodeAddress())){ newNeighbours.add(i); - // todo potential neighbours list + // potential neighbours list } } -// newNeighbours; TODO subhashini this is the unique neighbours list you can call your function here and input this list as a paremeter + node.join(newNeighbours); // send requests to new neighbours }).start(); break;