fedserv/echoIRCd
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

server: add a config_gen counter bumped on every rehash — lets modules cache config parsed into a hot-path structure and invalidate it correctly (a REHASH can't leave a stale cache), unblocking the per-message/per-command config re-parse in disable/autodrop/securitygroups/restrictcommands/connclass

Browse source
This commit is contained in:
Jean Chevronnet 2026-08-19 01:51:08 +00:00
parent 11852332dc
commit 78be7279b0
1 changed files with 6 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/server.rs
View file

@ -162,6 +162,10 @@ pub struct Server {
/// settings via [`Server::conf`] / [`conf_all`] / [`conf_bool`] / [`conf_num`] /// settings via [`Server::conf`] / [`conf_all`] / [`conf_bool`] / [`conf_num`]
/// — no per-module field lives on this struct (module-per-file rule). /// — no per-module field lives on this struct (module-per-file rule).
pub raw_config: HashMap<String, Vec<String>>, pub raw_config: HashMap<String, Vec<String>>,
/// Bumped on every rehash. Modules that parse config into a hot-path structure
/// cache it in `ext` tagged with this value and re-parse only when it changes,
/// so a REHASH can never leave a stale cache (see e.g. `modules::disable`).
pub config_gen: u64,
// labeled-response: while Some((uid, buf)), that client's own responses are // labeled-response: while Some((uid, buf)), that client's own responses are
// diverted into `buf` instead of the socket, so `on_line` can wrap them with // diverted into `buf` instead of the socket, so `on_line` can wrap them with
// the command's `label` (single tag, BATCH, or ACK). RefCell because the // the command's `label` (single tag, BATCH, or ACK). RefCell because the
@ -217,6 +221,7 @@ impl Server {
sasl_server: cfg.sasl_server, sasl_server: cfg.sasl_server,
webirc: cfg.webirc, webirc: cfg.webirc,
raw_config: cfg.raw, raw_config: cfg.raw,
config_gen: 0,
label_capture: RefCell::new(None), label_capture: RefCell::new(None),
log: RefCell::new(LogState::default()), log: RefCell::new(LogState::default()),
event_tx, event_tx,
@ -272,6 +277,7 @@ impl Server {
self.sasl_server = fresh.sasl_server; self.sasl_server = fresh.sasl_server;
self.webirc = fresh.webirc; self.webirc = fresh.webirc;
self.raw_config = fresh.raw; self.raw_config = fresh.raw;
self.config_gen = self.config_gen.wrapping_add(1); // invalidate module config caches
// Re-evaluate which linked servers are services against the fresh // Re-evaluate which linked servers are services against the fresh
// `uline`/`sasl_server` config (re-evaluated on every rehash). // `uline`/`sasl_server` config (re-evaluated on every rehash).
let names: Vec<(String, String)> = self let names: Vec<(String, String)> = self