diff --git a/crates/tor-netdoc/semver.md b/crates/tor-netdoc/semver.md index 23df35550c60e7641c016fc41807d00f4010a8e5..9531bead8a0c0dfc361baa84bbc34255ab4ad678 100644 --- a/crates/tor-netdoc/semver.md +++ b/crates/tor-netdoc/semver.md @@ -21,5 +21,5 @@ ADDED: `F64Finite` type ADDED: `doc::netstatus::{plain, md, vote}::NetworkStatus` BREAKING: `AuthCertUnverified::verify` doesn't take times; instead returns `TimerangeBound` DEPRECATED: `parse2::check_validity_time` and `check_validity_time_tolerance` -ADDED: `RouterStatus` fields `r.dir_port`, `p`, `id` ADDED: `impl From for Error` +ADDED: `RouterStatus` fields `r.dir_port`, `p`, `id`, `stats` diff --git a/crates/tor-netdoc/src/doc/netstatus/rs.rs b/crates/tor-netdoc/src/doc/netstatus/rs.rs index 0ad6728d15cf3e5e9832cbc3a5d282384aa63313..2cb57272eda92cac8ca84ddf8ec5f4b3e8a1268b 100644 --- a/crates/tor-netdoc/src/doc/netstatus/rs.rs +++ b/crates/tor-netdoc/src/doc/netstatus/rs.rs @@ -11,8 +11,9 @@ pub(crate) mod plain; pub(crate) mod vote; use super::{ConsensusFlavor, ConsensusMethods, consensus_methods_comma_separated}; -use crate::doc::netstatus::NetstatusKwd; -use crate::doc::netstatus::{IgnoredPublicationTimeSp, Protocols, RelayWeight, RelayWeightsItem}; +use crate::doc::netstatus::{ + IgnoredPublicationTimeSp, NetParams, NetstatusKwd, Protocols, RelayWeight, RelayWeightsItem, +}; use crate::encode::{EncodeOrd, ItemEncoder}; use crate::parse::parser::Section; use crate::parse2::ItemArgumentParseable; diff --git a/crates/tor-netdoc/src/doc/netstatus/rs/build/each_flavor.rs b/crates/tor-netdoc/src/doc/netstatus/rs/build/each_flavor.rs index 586139d77f7c31f0a5d3a3840baf44e02cd57c85..7df5afb9b3e110eb6779f5a9cb430a887cc48f10 100644 --- a/crates/tor-netdoc/src/doc/netstatus/rs/build/each_flavor.rs +++ b/crates/tor-netdoc/src/doc/netstatus/rs/build/each_flavor.rs @@ -197,6 +197,7 @@ impl RouterStatusBuilder { weight, port_policy: ns_expr!(None, NotPresent, Void {}), ed25519_id: NotPresent, + stats: NotPresent, }) } diff --git a/crates/tor-netdoc/src/doc/netstatus/rs/each_flavor.rs b/crates/tor-netdoc/src/doc/netstatus/rs/each_flavor.rs index f2181670b497ea8573188003e96640d2681a4edc..5f25e18d3dbd80197e7e92a97182ef212f6c6c97 100644 --- a/crates/tor-netdoc/src/doc/netstatus/rs/each_flavor.rs +++ b/crates/tor-netdoc/src/doc/netstatus/rs/each_flavor.rs @@ -199,6 +199,7 @@ impl RouterStatus { weight, port_policy: ns_expr!(None, NotPresent, Void {}), ed25519_id: NotPresent, + stats: NotPresent, }) } } diff --git a/crates/tor-netdoc/src/doc/netstatus/rs/each_variety.rs b/crates/tor-netdoc/src/doc/netstatus/rs/each_variety.rs index f20bedbbc51c8e1334b11b127e9e12e0e52b05cd..407b160a7ea071d0391f0b6dcc771cba77ddb069 100644 --- a/crates/tor-netdoc/src/doc/netstatus/rs/each_variety.rs +++ b/crates/tor-netdoc/src/doc/netstatus/rs/each_variety.rs @@ -174,6 +174,11 @@ pub struct RouterStatus { // otherwise, we are missing handling of `id none`. #[deftly(netdoc(keyword = "id"))] pub ed25519_id: ns_type!(NotPresent, NotPresent, Ed25519IdentityLine), + + /// `stats` -- Statistics for this relay + /// + /// + pub stats: ns_type!(NotPresent, NotPresent, NetParams), } impl RouterStatus {