Skip to content

Commit e0cba73

Browse files
committed
add extra slash (testing)
1 parent 7b530b8 commit e0cba73

File tree

1 file changed

+5
-7
lines changed

1 file changed

+5
-7
lines changed

src/main/java/org/ton/executors/dhtserver/DhtServer.java

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,8 @@ public void copyDhtServersFromGenesisGlobalConfig(String myGlobalConfigLocation)
8888
String globalConfigContent = FileUtils.readFileToString(new File(MyLocalTon.getInstance().getSettings().getGenesisNode().getNodeGlobalConfigLocation()), StandardCharsets.UTF_8);
8989
String myConfigContent = FileUtils.readFileToString(new File(myGlobalConfigLocation), StandardCharsets.UTF_8);
9090
log.debug("Replace current list of dht nodes with a new one");
91-
String myNodes = MyLocalTonUtils.sbb( myConfigContent, "\"nodes\": [");
92-
String globalNodes = MyLocalTonUtils.sbb( globalConfigContent, "\"nodes\": [");
91+
String myNodes = MyLocalTonUtils.sbb(myConfigContent, "\"nodes\": [");
92+
String globalNodes = MyLocalTonUtils.sbb(globalConfigContent, "\"nodes\": [");
9393
String replacedLocalConfig = StringUtils.replace(myConfigContent, myNodes, globalNodes);
9494
FileUtils.writeStringToFile(new File(myGlobalConfigLocation), replacedLocalConfig, StandardCharsets.UTF_8);
9595
// log.debug("dht-nodes updated: {}", Files.readString(Paths.get(myGlobalConfig), StandardCharsets.UTF_8));
@@ -138,12 +138,10 @@ private List<String> generateDhtKeys(Node node, long publicIpNum) throws Excepti
138138
if (file.length() == 64) { //take only hash files
139139
log.debug("found keyring file {}", file);
140140

141-
if (SystemUtils.IS_OS_WINDOWS) {
142-
dhtNodes.add(new RandomIdExecutor().execute(node, "-m", "dht", "-k", node.getDhtServerKeyringDir() + file,
143-
"-a", "\"{\\\"@type\\\": \\\"adnl.addressList\\\", \\\"addrs\\\":[{\\\"@type\\\": \\\"adnl.address.udp\\\", \\\"ip\\\": " + publicIpNum + ", \\\"port\\\": " + node.getDhtPort() + " } ], \\\"version\\\": 0, \\\"reinit_date\\\": 0, \\\"priority\\\": 0, \\\"expire_at\\\": 0}\""));
141+
if (SystemUtils.IS_OS_WINDOWS || SystemUtils.IS_OS_LINUX) {
142+
dhtNodes.add(new RandomIdExecutor().execute(node, "-m", "dht", "-k", node.getDhtServerKeyringDir() + file, "-a", "\"{\\\"@type\\\": \\\"adnl.addressList\\\", \\\"addrs\\\":[{\\\"@type\\\": \\\"adnl.address.udp\\\", \\\"ip\\\": " + publicIpNum + ", \\\"port\\\": " + node.getDhtPort() + " } ], \\\"version\\\": 0, \\\"reinit_date\\\": 0, \\\"priority\\\": 0, \\\"expire_at\\\": 0}\""));
144143
} else {
145-
dhtNodes.add(new RandomIdExecutor().execute(node, "-m", "dht", "-k", node.getDhtServerKeyringDir() + file,
146-
"-a", "{\"@type\": \"adnl.addressList\", \"addrs\":[{\"@type\": \"adnl.address.udp\", \"ip\": " + publicIpNum + ", \"port\": " + node.getDhtPort() + " } ], \"version\": 0, \"reinit_date\": 0, \"priority\": 0, \"expire_at\": 0}"));
144+
dhtNodes.add(new RandomIdExecutor().execute(node, "-m", "dht", "-k", node.getDhtServerKeyringDir() + file, "-a", "{\"@type\": \"adnl.addressList\", \"addrs\":[{\"@type\": \"adnl.address.udp\", \"ip\": " + publicIpNum + ", \"port\": " + node.getDhtPort() + " } ], \"version\": 0, \"reinit_date\": 0, \"priority\": 0, \"expire_at\": 0}"));
147145
}
148146
}
149147
}

0 commit comments

Comments
 (0)