feat(network): enable dcutr

maidsafe · Jan 7, 2025 · ecd4ce5 · ecd4ce5
1 parent 7af69db
commit ecd4ce5
Show file tree

Hide file tree

Showing 6 changed files with 53 additions and 0 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/ant-networking/Cargo.toml b/ant-networking/Cargo.toml
@@ -40,6 +40,7 @@ hyper = { version = "0.14", features = [
 itertools = "~0.12.1"
 lazy_static = "~1.4.0"
 libp2p = { version = "0.54.1", features = [
+    "dcutr",
     "tokio",
     "dns",
     "kad",

diff --git a/ant-networking/src/driver.rs b/ant-networking/src/driver.rs
@@ -260,6 +260,7 @@ pub(super) struct NodeBehaviour {
     pub(super) upnp: libp2p::swarm::behaviour::toggle::Toggle<libp2p::upnp::tokio::Behaviour>,
     pub(super) relay_client: libp2p::relay::client::Behaviour,
     pub(super) relay_server: libp2p::relay::Behaviour,
+    pub(super) dcutr: libp2p::dcutr::Behaviour,
     pub(super) kademlia: kad::Behaviour<UnifiedRecordStore>,
     pub(super) request_response: request_response::cbor::Behaviour<Request, Response>,
 }
@@ -683,6 +684,7 @@ impl NetworkBuilder {
             #[cfg(feature = "upnp")]
             upnp,
             request_response,
+            dcutr: libp2p::dcutr::Behaviour::new(peer_id),
             kademlia,
             identify,
             #[cfg(feature = "local")]

diff --git a/ant-networking/src/event/mod.rs b/ant-networking/src/event/mod.rs
@@ -49,11 +49,18 @@ pub(super) enum NodeEvent {
     #[cfg(feature = "local")]
     Mdns(Box<mdns::Event>),
     Identify(Box<libp2p::identify::Event>),
+    Dcutr(Box<libp2p::dcutr::Event>),
     RelayClient(Box<libp2p::relay::client::Event>),
     RelayServer(Box<libp2p::relay::Event>),
     Void(void::Void),
 }
 
+impl From<libp2p::dcutr::Event> for NodeEvent {
+    fn from(event: libp2p::dcutr::Event) -> Self {
+        NodeEvent::Dcutr(Box::new(event))
+    }
+}
+
 #[cfg(feature = "upnp")]
 impl From<libp2p::upnp::Event> for NodeEvent {
     fn from(event: libp2p::upnp::Event) -> Self {

diff --git a/ant-networking/src/event/swarm.rs b/ant-networking/src/event/swarm.rs
@@ -69,6 +69,18 @@ impl SwarmDriver {
                     }
                 }
             }
+            SwarmEvent::Behaviour(NodeEvent::Dcutr(event)) => {
+                #[cfg(feature = "open-metrics")]
+                if let Some(metrics) = &self.metrics_recorder {
+                    metrics.record(&(*event));
+                }
+
+                event_string = "dcutr_event";
+                info!(
+                    "Dcutr with remote peer: {:?} is: {:?}",
+                    event.remote_peer_id, event.result
+                );
+            }
             #[cfg(feature = "upnp")]
             SwarmEvent::Behaviour(NodeEvent::Upnp(upnp_event)) => {
                 #[cfg(feature = "open-metrics")]

diff --git a/ant-networking/src/metrics/mod.rs b/ant-networking/src/metrics/mod.rs
@@ -345,3 +345,9 @@ impl<T> Recorder<libp2p::swarm::SwarmEvent<T>> for NetworkMetricsRecorder {
         self.libp2p_metrics.record(event);
     }
 }
+
+impl Recorder<libp2p::dcutr::Event> for NetworkMetricsRecorder {
+    fn record(&self, event: &libp2p::dcutr::Event) {
+        self.libp2p_metrics.record(event)
+    }
+}