diff options
| -rw-r--r-- | Cargo.lock | 21 | ||||
| -rw-r--r-- | Cargo.toml | 2 | ||||
| -rw-r--r-- | src/error.rs | 2 | ||||
| -rw-r--r-- | src/main.rs | 42 |
4 files changed, 34 insertions, 33 deletions
@@ -688,9 +688,9 @@ dependencies = [ "bytes", "dns-message-parser", "ipnet", - "notify", "rsdsl_dhcp4d", "serde_json", + "signal-hook", "thiserror", "trust-dns-proto 0.22.0", ] @@ -800,6 +800,25 @@ dependencies = [ ] [[package]] +name = "signal-hook" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8621587d4798caf8eb44879d42e56b9a93ea5dcd315a6487c357130095b62801" +dependencies = [ + "libc", + "signal-hook-registry", +] + +[[package]] +name = "signal-hook-registry" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" +dependencies = [ + "libc", +] + +[[package]] name = "slab" version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -10,8 +10,8 @@ byteorder = "1.4.3" bytes = "1.4.0" dns-message-parser = "0.7.0" ipnet = "2.5.0" -notify = "5.1.0" rsdsl_dhcp4d = { git = "https://github.com/rsdsl/dhcp4d.git", version = "0.1.6" } serde_json = "1.0" +signal-hook = "0.3.17" thiserror = "1.0" trust-dns-proto = "0.22.0" diff --git a/src/error.rs b/src/error.rs index 8bc2225..3103b23 100644 --- a/src/error.rs +++ b/src/error.rs @@ -14,8 +14,6 @@ pub enum Error { DnsDecode(#[from] dns_message_parser::DecodeError), #[error("dns_message_parser encode: {0}")] DnsEncode(#[from] dns_message_parser::EncodeError), - #[error("notify: {0}")] - Notify(#[from] notify::Error), #[error("trust_dns_proto: {0}")] TrustDnsProto(#[from] trust_dns_proto::error::ProtoError), } diff --git a/src/main.rs b/src/main.rs index 1b75f6d..1502166 100644 --- a/src/main.rs +++ b/src/main.rs @@ -3,7 +3,6 @@ use rsdsl_dnsd::error::{Error, Result}; use std::cell::RefCell; use std::fs::{self, File}; use std::net::{IpAddr, SocketAddr, UdpSocket}; -use std::path::Path; use std::str::FromStr; use std::sync::{Arc, RwLock}; use std::thread; @@ -15,39 +14,27 @@ use dns_message_parser::question::{QType, Question}; use dns_message_parser::rr::{Class, A, PTR, RR}; use dns_message_parser::{Dns, DomainName, Flags, Opcode, RCode}; use ipnet::IpNet; -use notify::event::{AccessKind, AccessMode, CreateKind}; -use notify::{Event, EventKind, RecursiveMode, Watcher}; use rsdsl_dhcp4d::lease::Lease; +use signal_hook::{consts::SIGUSR1, iterator::Signals}; use trust_dns_proto::rr::Name; const UPSTREAM: &str = "[2620:fe::fe]:53"; fn refresh_leases(cache: Arc<RwLock<Vec<Lease>>>) -> Result<()> { - let mut watcher = notify::recommended_watcher(move |res: notify::Result<Event>| match res { - Ok(event) => { - if event.paths.iter().any(|v| { - v.to_str() - .expect("lease file name is not valid UTF-8") - .starts_with("/data/dhcp4d.leases_") - }) { - match event.kind { - EventKind::Create(kind) if kind == CreateKind::File => { - read_leases(cache.clone()).expect("can't read lease files"); - } - EventKind::Access(kind) if kind == AccessKind::Close(AccessMode::Write) => { - read_leases(cache.clone()).expect("can't read lease files"); - } - _ => {} - } - } - } - Err(e) => println!("watch error: {:?}", e), - })?; + let mut signals = Signals::new([SIGUSR1])?; + for _ in signals.forever() { + read_leases(cache.clone())?; + } - watcher.watch(Path::new("/data"), RecursiveMode::Recursive)?; + Ok(()) // unreachable +} +fn refresh_leases_supervised(cache: Arc<RwLock<Vec<Lease>>>) -> ! { loop { - thread::sleep(Duration::MAX) + match refresh_leases(cache.clone()) { + Ok(_) => {} + Err(e) => println!("[warn] lease refresh: {}", e), + } } } @@ -91,10 +78,7 @@ fn main() -> Result<()> { read_leases(leases.clone())?; let leases2 = leases.clone(); - thread::spawn(move || match refresh_leases(leases2) { - Ok(_) => unreachable!(), - Err(e) => println!("{}", e), - }); + thread::spawn(move || refresh_leases_supervised(leases2)); let domain = match fs::read_to_string("/data/dnsd.domain") { Ok(v) => match Name::from_utf8(v) { |