Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

limit the frequency of findnode messages #92

Open
wants to merge 1 commit into
base: release_v2.2.6
Choose a base branch
from
Open

limit the frequency of findnode messages #92

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions src/main/java/org/tron/p2p/discover/protocol/kad/NodeHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
import org.tron.p2p.discover.message.kad.NeighborsMessage;
import org.tron.p2p.discover.message.kad.PingMessage;
import org.tron.p2p.discover.message.kad.PongMessage;
import org.tron.p2p.discover.protocol.kad.table.KademliaOptions;
import org.tron.p2p.discover.socket.UdpEvent;

@Slf4j(topic = "net")
Expand All @@ -24,6 +25,7 @@ public class NodeHandler {
private AtomicInteger pingTrials = new AtomicInteger(3);
private volatile boolean waitForPong = false;
private volatile boolean waitForNeighbors = false;
private volatile long rcvFindNodeMsgTime;

public NodeHandler(Node node, KadService kadService) {
this.node = node;
Expand Down Expand Up @@ -139,6 +141,11 @@ public void handleNeighbours(NeighborsMessage msg, InetSocketAddress sender) {
}

public void handleFindNode(FindNodeMessage msg) {
long now = System.currentTimeMillis();
if (now - rcvFindNodeMsgTime < KademliaOptions.DISCOVER_CYCLE / 2) {
return;
}
rcvFindNodeMsgTime = now;
List<Node> closest = kadService.getTable().getClosestNodes(msg.getTargetId());
sendNeighbours(closest, msg.getTimestamp());
}
Expand Down
25 changes: 25 additions & 0 deletions src/test/java/org/tron/p2p/discover/protocol/kad/NodeHandlerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
import java.lang.reflect.Constructor;
import java.lang.reflect.Field;
import java.net.InetSocketAddress;
import java.util.ArrayList;
import java.util.Collections;

public class NodeHandlerTest {

Expand Down Expand Up @@ -81,6 +83,29 @@ public void testChangeState() throws Exception {
Assert.assertTrue(kadService.getTable().contains(replaceNode));
}

@Test
public void testHandleFindNode() throws Exception {
NodeHandler nodeHandler = new NodeHandler(new Node(new byte[1], "", "", 0), null);
Field field = nodeHandler.getClass().getDeclaredField("rcvFindNodeMsgTime");
field.setAccessible(true);
long time = (Long) field.get(nodeHandler);
Assert.assertEquals(time, 0);

try {
nodeHandler.handleFindNode(null);
} catch (Exception e) {}

time = (Long) field.get(nodeHandler);
Assert.assertTrue(time > 0);

try {
nodeHandler.handleFindNode(null);
} catch (Exception e) {}

long time2 = (Long) field.get(nodeHandler);
Assert.assertEquals(time, time2);
}

@AfterClass
public static void destroy() {
kadService.close();
Expand Down