Agent/P2p: fix build when DNS feature is disabled

Author: HeikoBornholdt

drasyl-agent/src/agent/network_listener.rs

@@ -1,9 +1,7 @@
 use crate::agent::AgentInner;
-use crate::agent::dns::AgentDnsInterface;
 use crate::network::Network;
 use ipnet::Ipv4Net;
 use std::collections::HashMap;
-use std::net::Ipv4Addr;
 use std::sync::Arc;
 use tokio::sync::MutexGuard;
 use tracing::trace;
@@ -53,6 +51,8 @@ impl AgentInner {
                 .collect();
             trace!("Collected {} IPs: {:?}", all_ips.len(), all_ips);
 
+            #[cfg(feature = "dns")]
+            use crate::agent::dns::AgentDnsInterface;
             let networks_change = NetworkChange {
                 routes: Some(all_routes),
                 ips: Some(all_ips),

drasyl-agent/src/ffi.rs

@@ -616,8 +616,9 @@ impl Drop for AgentPtr {
 
 #[repr(C)]
 pub struct NetworkChange {
-    pub ips: *const c_char,        // Comma-separated IPs, NULL if not available
-    pub routes: *const c_char,     // Comma-separated routes, NULL if not available
+    pub ips: *const c_char,    // Comma-separated IPs, NULL if not available
+    pub routes: *const c_char, // Comma-separated routes, NULL if not available
+    #[cfg(feature = "dns")]
     pub dns_server: *const c_char, // DNS server, NULL if not available
 }
 
@@ -676,6 +677,7 @@ pub extern "C" fn drasyl_agent_start(
                     .unwrap_or_default();
 
                 // Convert DNS server to string
+                #[cfg(feature = "dns")]
                 let dns_server_str = if let Some(dns_server) = change.dns_server {
                     CString::new(dns_server.to_string()).unwrap_or_default()
                 } else {
@@ -685,6 +687,7 @@ pub extern "C" fn drasyl_agent_start(
                 let c_change = NetworkChange {
                     ips: ips_str.as_ptr(),
                     routes: routes_str.as_ptr(),
+                    #[cfg(feature = "dns")]
                     dns_server: dns_server_str.as_ptr(),
                 };
 

drasyl-p2p/benches/crypto.rs

@@ -1,17 +1,17 @@
 // benches/curve25519.rs
-use criterion::{black_box, criterion_group, criterion_main, Criterion};
+use criterion::{Criterion, black_box, criterion_group, criterion_main};
 use drasyl_p2p::crypto::{
-    compute_kx_session_keys,
-    convert_ed25519_pk_to_curve25519_pk,
-    convert_ed25519_sk_to_curve25519_sk,
-    generate_sign_keypair,
-    AgreementPubKey, AgreementSecKey, SigningPubKey, SigningSecKey, SessionKey,
+    AgreementPubKey, AgreementSecKey, SessionKey, SigningPubKey, SigningSecKey,
+    compute_kx_session_keys, convert_ed25519_pk_to_curve25519_pk,
+    convert_ed25519_sk_to_curve25519_sk, generate_sign_keypair,
 };
 use libsodium_sys as sodium;
 
 fn sodium_init_once() {
     static ONCE: std::sync::Once = std::sync::Once::new();
-    ONCE.call_once(|| unsafe { let _ = sodium::sodium_init(); });
+    ONCE.call_once(|| unsafe {
+        let _ = sodium::sodium_init();
+    });
 }
 
 // --- Helpers: neue Impl ausschließlich über crypto/mod.rs -------------------
@@ -67,11 +67,9 @@ fn bench_kx_session_keys(c: &mut Criterion) {
     // neue Impl: compute_kx_session_keys aus crypto/mod.rs
     group.bench_function("new-impl/kx", |b| {
         b.iter(|| {
-            let (rx, tx): (SessionKey, SessionKey) = compute_kx_session_keys(
-                black_box(&my_pk),
-                black_box(&my_sk),
-                black_box(&peer_pk),
-            ).unwrap();
+            let (rx, tx): (SessionKey, SessionKey) =
+                compute_kx_session_keys(black_box(&my_pk), black_box(&my_sk), black_box(&peer_pk))
+                    .unwrap();
             black_box((rx, tx));
         });
     });

drasyl-p2p/src/crypto/mod.rs

@@ -2,8 +2,8 @@ mod error;
 mod session_key;
 
 pub use error::*;
-use rand_chacha::rand_core::{RngCore, SeedableRng};
 use rand_chacha::ChaCha20Rng;
+use rand_chacha::rand_core::{RngCore, SeedableRng};
 pub use session_key::SessionKey;
 use std::cell::RefCell;
 
@@ -130,7 +130,7 @@ pub fn convert_ed25519_sk_to_curve25519_sk(sk: &SigningSecKey) -> Result<Agreeme
         .map_err(|_| Error::DalekError)?;
 
     // 1) SHA-512(seed)
-    let mut h: [u8; SHA512_BYTES] = Sha512::digest(&seed).into();
+    let mut h: [u8; SHA512_BYTES] = Sha512::digest(seed).into();
 
     // 2) X25519 clamping
     h[0] &= 248;

drasyl-p2p/tests/crypto.rs

@@ -13,7 +13,7 @@ fn sodium_init_once() {
 // ---------------------------------------------------------------------------
 mod old_ref {
     use super::*;
-    
+
     pub(crate) const ED25519_SECRETKEYBYTES: usize = 64;
     pub(crate) const ED25519_PUBLICKEYBYTES: usize = 32;
     pub(crate) const CURVE25519_SECRETKEYBYTES: usize = 32;