WIP

ntpd/src/daemon/config/mod.rs

@@ -372,6 +372,8 @@ impl Config {
                 PeerConfig::Standard(_) => count += 1,
                 PeerConfig::Nts(_) => count += 1,
                 PeerConfig::Pool(config) => count += config.max_peers,
+                #[cfg(feature = "unstable_nts-pool")]
+                PeerConfig::NtsPool(config) => count += config.max_peers,
             }
         }
         count

ntpd/src/daemon/config/peer.rs

@@ -63,6 +63,22 @@ fn max_peers_default() -> usize {
     4
 }
 
+#[cfg(feature = "unstable_nts-pool")]
+#[derive(Deserialize, Debug, PartialEq, Eq, Clone)]
+#[serde(deny_unknown_fields)]
+pub struct NtsPoolPeerConfig {
+    #[serde(rename = "address")]
+    pub addr: NtsKeAddress,
+    #[serde(
+        deserialize_with = "deserialize_certificate_authorities",
+        default = "default_certificate_authorities",
+        rename = "certificate-authority"
+    )]
+    pub certificate_authorities: Arc<[Certificate]>,
+    #[serde(rename = "count", default = "max_peers_default")]
+    pub max_peers: usize,
+}
+
 #[derive(Debug, Deserialize, PartialEq, Eq, Clone)]
 #[serde(tag = "mode")]
 pub enum PeerConfig {
@@ -73,6 +89,9 @@ pub enum PeerConfig {
     #[serde(rename = "pool")]
     Pool(PoolPeerConfig),
     // Consul(ConsulPeerConfig),
+    #[cfg(feature = "unstable_nts-pool")]
+    #[serde(rename = "nts-pool")]
+    NtsPool(NtsPoolPeerConfig),
 }
 
 /// A normalized address has a host and a port part. However, the host may be
@@ -312,6 +331,8 @@ mod tests {
             PeerConfig::Standard(c) => c.address.to_string(),
             PeerConfig::Nts(c) => c.address.to_string(),
             PeerConfig::Pool(c) => c.addr.to_string(),
+            #[cfg(feature = "unstable_nts-pool")]
+            PeerConfig::NtsPool(c) => c.addr.to_string(),
         }
     }
 
@@ -396,6 +417,22 @@ mod tests {
         if let PeerConfig::Nts(config) = test.peer {
             assert_eq!(config.address.to_string(), "example.com:4460");
         }
+
+        #[cfg(feature = "unstable_nts-pool")]
+        {
+            let test: TestConfig = toml::from_str(
+                r#"
+            [peer]
+            address = "example.com"
+            mode = "nts-pool"
+            "#,
+            )
+            .unwrap();
+            assert!(matches!(test.peer, PeerConfig::NtsPool(_)));
+            if let PeerConfig::Nts(config) = test.peer {
+                assert_eq!(config.address.to_string(), "example.com:4460");
+            }
+        }
     }
 
     #[test]

ntpd/src/daemon/spawn/mod.rs

@@ -9,6 +9,8 @@ use super::config::NormalizedAddress;
 #[cfg(test)]
 pub mod dummy;
 pub mod nts;
+#[cfg(feature = "unstable_nts-pool")]
+pub mod nts_pool;
 pub mod pool;
 pub mod standard;
 

ntpd/src/daemon/spawn/nts_pool.rs

@@ -0,0 +1 @@
+

ntpd/src/daemon/system.rs

@@ -127,6 +127,15 @@ pub async fn spawn(
                         std::io::Error::new(std::io::ErrorKind::Other, e)
                     })?;
             }
+            #[cfg(feature = "unstable_nts-pool")]
+            PeerConfig::NtsPool(cfg) => {
+                system
+                    .add_spawner(NtsPoolSpawner::new(cfg.clone(), NETWORK_WAIT_PERIOD))
+                    .map_err(|e| {
+                        tracing::error!("Could not spawn peer: {}", e);
+                        std::io::Error::new(std::io::ErrorKind::Other, e)
+                    })?;
+            }
         }
     }