rebase fix

Author: simonwicky

nym-vpn-core/crates/nym-vpnd/src/service/config/config_manager.rs

@@ -200,6 +200,20 @@ impl VpnServiceConfigManager {
         }
     }
 
+    pub async fn set_netstats_allow_disconnected(&mut self, allow_disconnected: bool) {
+        if self.config.network_stats.allow_disconnected != allow_disconnected {
+            self.config.network_stats.allow_disconnected = allow_disconnected;
+            self.save_config_and_send_event().await;
+        }
+    }
+
+    pub async fn set_netstats_enabled(&mut self, enabled: bool) {
+        if self.config.network_stats.enabled != enabled {
+            self.config.network_stats.enabled = enabled;
+            self.save_config_and_send_event().await;
+        }
+    }
+
     async fn save_config_and_send_event(&self) {
         // This function already logs
         let _ = self.write_to_file().await;

nym-vpn-core/crates/nym-vpnd/src/service/config/tests.rs

@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
 use super::*;
+use nym_vpn_lib_types::NetworkStatisticsConfig;
 use std::{net::IpAddr, str::FromStr};
 use tempfile::tempdir;
 
@@ -486,6 +487,10 @@ async fn test_service_config_serialize_full() {
             IpAddr::from_str("192.168.50.1").unwrap(),
             IpAddr::from_str("2001:db8:85a3::8a2e:370:7334").unwrap(),
         ]),
+        network_stats: NetworkStatisticsConfig {
+            enabled: true,
+            allow_disconnected: false,
+        },
     };
     run_serialize_test(config).await;
 }

nym-vpn-core/crates/nym-vpnd/src/service/config/v2.rs

@@ -63,6 +63,7 @@ impl TryFrom<VpnServiceConfig> for nym_vpn_lib_types::VpnServiceConfig {
             min_gateway_vpn_performance: value.min_gateway_vpn_performance,
             residential_exit: value.residential_exit,
             custom_dns,
+            network_stats: Default::default(),
         };
         Ok(config)
     }

nym-vpn-core/crates/nym-vpnd/src/service/config/v3.rs

@@ -8,6 +8,7 @@ use crate::service::{
         entry_exit::v2::{EntryPoint, ExitPoint},
     },
 };
+use nym_vpn_lib_types::NetworkStatisticsConfig;
 use serde::{Deserialize, Serialize};
 use std::{net::IpAddr, str::FromStr};
 
@@ -27,6 +28,7 @@ pub struct VpnServiceConfig {
     min_gateway_vpn_performance: Option<u8>,
     residential_exit: bool,
     custom_dns: Option<Vec<String>>,
+    network_stats: NetworkStatisticsConfig,
 }
 
 impl From<VpnServiceConfig> for VpnServiceConfigExt {
@@ -67,6 +69,7 @@ impl TryFrom<VpnServiceConfig> for nym_vpn_lib_types::VpnServiceConfig {
             min_gateway_vpn_performance: value.min_gateway_vpn_performance,
             residential_exit: value.residential_exit,
             custom_dns,
+            network_stats: value.network_stats,
         };
         Ok(config)
     }
@@ -100,6 +103,7 @@ impl TryFrom<&nym_vpn_lib_types::VpnServiceConfig> for VpnServiceConfigExtLatest
             min_gateway_vpn_performance: value.min_gateway_vpn_performance,
             residential_exit: value.residential_exit,
             custom_dns,
+            network_stats: value.network_stats,
         };
         Ok(ext_config)
     }