Fix identify call on new connections

Make sure to add outbound connections to address book in kademlia so we have bootstrap nodes in there Switch to TLS before noise
Peergos · Jul 12, 2023 · c1cfbea · c1cfbea
1 parent 1b94a80
commit c1cfbea
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 8 deletions.
diff --git a/src/main/java/org/peergos/HostBuilder.java b/src/main/java/org/peergos/HostBuilder.java
@@ -146,8 +146,8 @@ public static Host build(PrivKey privKey,
         Host host = BuilderJKt.hostJ(Builder.Defaults.None, b -> {
             b.getIdentity().setFactory(() -> privKey);
             b.getTransports().add(TcpTransport::new);
-            b.getSecureChannels().add((k, m) -> new NoiseXXSecureChannel(k, m));
-            b.getSecureChannels().add((k, m) -> new TlsSecureChannel(k, m));
+            b.getSecureChannels().add(TlsSecureChannel::new);
+            b.getSecureChannels().add(NoiseXXSecureChannel::new);
 
             b.getMuxers().addAll(muxers);
             RamAddressBook addrs = new RamAddressBook();
@@ -177,12 +177,16 @@ public static Host build(PrivKey privKey,
 
             // Send an identify req on all new connections
             b.getConnectionHandlers().add(connection -> {
-                IdentifyOuterClass.Identify remoteId = connection.muxerSession()
-                        .createStream(new IdentifyBinding(new IdentifyProtocol())).getController().join().id().join();
-                addrs.setAddrs(connection.remoteAddress().getPeerId(), 0, remoteId.getListenAddrsList()
-                        .stream()
-                        .map(bytes -> Multiaddr.deserialize(bytes.toByteArray()))
-                        .toArray(Multiaddr[]::new));
+                if (connection.isInitiator())
+                    return;
+                StreamPromise<IdentifyController> stream = connection.muxerSession()
+                        .createStream(new IdentifyBinding(new IdentifyProtocol()));
+                stream.getController()
+                        .thenCompose(IdentifyController::id)
+                        .thenApply(remoteId -> addrs.setAddrs(connection.remoteAddress().getPeerId(), 0, remoteId.getListenAddrsList()
+                                .stream()
+                                .map(bytes -> Multiaddr.deserialize(bytes.toByteArray()))
+                                .toArray(Multiaddr[]::new)));
             });
 
             for (String listenAddr : listenAddrs) {

diff --git a/src/main/java/org/peergos/protocol/dht/KademliaEngine.java b/src/main/java/org/peergos/protocol/dht/KademliaEngine.java
@@ -40,6 +40,7 @@ public void setAddressBook(AddressBook addrs) {
 
     public synchronized void addOutgoingConnection(PeerId peer, Multiaddr addr) {
         router.touch(Instant.now(), new Node(Id.create(Hash.sha256(peer.getBytes()), 256), peer.toString()));
+        addressBook.addAddrs(peer, 0, addr);
     }
 
     public synchronized void addIncomingConnection(PeerId peer, Multiaddr addr) {