basic reloading

Cargo.lock

@@ -2,6 +2,15 @@
 # It is not intended for manual editing.
 version = 4
 
+[[package]]
+name = "aho-corasick"
+version = "1.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ddd31a130427c27518df266943a5308ed92d4b226cc639f5a8f1002816174301"
+dependencies = [
+ "memchr",
+]
+
 [[package]]
 name = "anstream"
 version = "0.6.21"
@@ -58,6 +67,16 @@ version = "2.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "812e12b5285cc515a9c72a5c1d3b6d46a19dac5acfef5265968c166106e31dd3"
 
+[[package]]
+name = "cc"
+version = "1.2.43"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "739eb0f94557554b3ca9a86d2d37bebd49c5e6d0c1d2bda35ba5bdac830befc2"
+dependencies = [
+ "find-msvc-tools",
+ "shlex",
+]
+
 [[package]]
 name = "cfg-if"
 version = "1.0.4"
@@ -116,12 +135,190 @@ version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b05b61dc5112cbb17e4b6cd61790d9845d13888356391624cbe7e41efeac1e75"
 
+[[package]]
+name = "cordyceps"
+version = "0.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "688d7fbb8092b8de775ef2536f36c8c31f2bc4006ece2e8d8ad2d17d00ce0a2a"
+dependencies = [
+ "loom",
+ "tracing",
+]
+
+[[package]]
+name = "diatomic-waker"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ab03c107fafeb3ee9f5925686dbb7a73bc76e3932abb0d2b365cb64b169cf04c"
+
 [[package]]
 name = "equivalent"
 version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"
 
+[[package]]
+name = "fastrand"
+version = "2.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be"
+
+[[package]]
+name = "find-msvc-tools"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "52051878f80a721bb68ebfbc930e07b65ba72f2da88968ea5c06fd6ca3d3a127"
+
+[[package]]
+name = "fixedbitset"
+version = "0.5.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d674e81391d1e1ab681a28d99df07927c6d4aa5b027d7da16ba32d1d21ecd99"
+
+[[package]]
+name = "futures"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876"
+dependencies = [
+ "futures-channel",
+ "futures-core",
+ "futures-executor",
+ "futures-io",
+ "futures-sink",
+ "futures-task",
+ "futures-util",
+]
+
+[[package]]
+name = "futures-buffered"
+version = "0.2.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a8e0e1f38ec07ba4abbde21eed377082f17ccb988be9d988a5adbf4bafc118fd"
+dependencies = [
+ "cordyceps",
+ "diatomic-waker",
+ "futures-core",
+ "pin-project-lite",
+ "spin",
+]
+
+[[package]]
+name = "futures-channel"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10"
+dependencies = [
+ "futures-core",
+ "futures-sink",
+]
+
+[[package]]
+name = "futures-concurrency"
+version = "7.6.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0eb68017df91f2e477ed4bea586c59eaecaa47ed885a770d0444e21e62572cd2"
+dependencies = [
+ "fixedbitset",
+ "futures-buffered",
+ "futures-core",
+ "futures-lite",
+ "pin-project",
+ "slab",
+ "smallvec",
+]
+
+[[package]]
+name = "futures-core"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e"
+
+[[package]]
+name = "futures-executor"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f"
+dependencies = [
+ "futures-core",
+ "futures-task",
+ "futures-util",
+]
+
+[[package]]
+name = "futures-io"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6"
+
+[[package]]
+name = "futures-lite"
+version = "2.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f78e10609fe0e0b3f4157ffab1876319b5b0db102a2c60dc4626306dc46b44ad"
+dependencies = [
+ "fastrand",
+ "futures-core",
+ "futures-io",
+ "parking",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "futures-macro"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "futures-sink"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7"
+
+[[package]]
+name = "futures-task"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988"
+
+[[package]]
+name = "futures-util"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81"
+dependencies = [
+ "futures-channel",
+ "futures-core",
+ "futures-io",
+ "futures-macro",
+ "futures-sink",
+ "futures-task",
+ "memchr",
+ "pin-project-lite",
+ "pin-utils",
+ "slab",
+]
+
+[[package]]
+name = "generator"
+version = "0.8.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "605183a538e3e2a9c1038635cc5c2d194e2ee8fd0d1b66b8349fad7dbacce5a2"
+dependencies = [
+ "cc",
+ "cfg-if",
+ "libc",
+ "log",
+ "rustversion",
+ "windows",
+]
+
 [[package]]
 name = "hashbrown"
 version = "0.16.0"
@@ -168,12 +365,40 @@ version = "0.4.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "34080505efa8e45a4b816c349525ebe327ceaa8559756f0356cba97ef3bf7432"
 
+[[package]]
+name = "loom"
+version = "0.7.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "419e0dc8046cb947daa77eb95ae174acfbddb7673b4151f56d1eed8e93fbfaca"
+dependencies = [
+ "cfg-if",
+ "generator",
+ "scoped-tls",
+ "tracing",
+ "tracing-subscriber",
+]
+
 [[package]]
 name = "main_error"
 version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "155db5e86c6e45ee456bf32fad5a290ee1f7151c2faca27ea27097568da67d1a"
 
+[[package]]
+name = "matchers"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d1525a2a28c7f4fa0fc98bb91ae755d1e2d1505079e05539e35bc876b5d65ae9"
+dependencies = [
+ "regex-automata",
+]
+
+[[package]]
+name = "memchr"
+version = "2.7.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f52b00d39961fc5b2736ea853c9cc86238e165017a493d1d5c8eac6bdc4cc273"
+
 [[package]]
 name = "mio"
 version = "1.1.0"
@@ -190,6 +415,8 @@ name = "netnsd"
 version = "0.1.0"
 dependencies = [
  "clap",
+ "futures",
+ "futures-concurrency",
  "main_error",
  "nix",
  "sd-notify",
@@ -197,6 +424,7 @@ dependencies = [
  "serde_test",
  "thiserror",
  "tokio",
+ "tokio-stream",
  "toml",
  "tracing",
  "tracing-subscriber",
@@ -235,12 +463,44 @@ version = "1.70.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "384b8ab6d37215f3c5301a95a4accb5d64aa607f1fcb26a11b5303878451b4fe"
 
+[[package]]
+name = "parking"
+version = "2.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba"
+
+[[package]]
+name = "pin-project"
+version = "1.1.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "677f1add503faace112b9f1373e43e9e054bfdd22ff1a63c1bc485eaec6a6a8a"
+dependencies = [
+ "pin-project-internal",
+]
+
+[[package]]
+name = "pin-project-internal"
+version = "1.1.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6e918e4ff8c4549eb882f14b3a4bc8c8bc93de829416eacf579f1207a8fbf861"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "pin-project-lite"
 version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b"
 
+[[package]]
+name = "pin-utils"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
+
 [[package]]
 name = "proc-macro2"
 version = "1.0.103"
@@ -259,6 +519,35 @@ dependencies = [
  "proc-macro2",
 ]
 
+[[package]]
+name = "regex-automata"
+version = "0.4.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5276caf25ac86c8d810222b3dbb938e512c55c6831a10f3e6ed1c93b84041f1c"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-syntax",
+]
+
+[[package]]
+name = "regex-syntax"
+version = "0.8.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a2d987857b319362043e95f5353c0535c1f58eec5336fdfcf626430af7def58"
+
+[[package]]
+name = "rustversion"
+version = "1.0.22"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d"
+
+[[package]]
+name = "scoped-tls"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294"
+
 [[package]]
 name = "sd-notify"
 version = "0.4.5"
@@ -325,6 +614,12 @@ dependencies = [
  "lazy_static",
 ]
 
+[[package]]
+name = "shlex"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
+
 [[package]]
 name = "signal-hook-registry"
 version = "1.4.6"
@@ -334,12 +629,24 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "slab"
+version = "0.4.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a2ae44ef20feb57a68b23d846850f861394c2e02dc425a50098ae8c90267589"
+
 [[package]]
 name = "smallvec"
 version = "1.15.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03"
 
+[[package]]
+name = "spin"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d5fe4ccb98d9c292d56fec89a5e07da7fc4cf0dc11e156b41793132775d3e591"
+
 [[package]]
 name = "strsim"
 version = "0.11.1"
@@ -411,6 +718,17 @@ dependencies = [
  "syn",
 ]
 
+[[package]]
+name = "tokio-stream"
+version = "0.1.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eca58d7bba4a75707817a2c44174253f9236b2d5fbd055602e9d5c07c139a047"
+dependencies = [
+ "futures-core",
+ "pin-project-lite",
+ "tokio",
+]
+
 [[package]]
 name = "toml"
 version = "0.9.8"
@@ -499,10 +817,14 @@ version = "0.3.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2054a14f5307d601f88daf0553e1cbf472acc4f2c51afab632431cdcd72124d5"
 dependencies = [
+ "matchers",
  "nu-ansi-term",
+ "once_cell",
+ "regex-automata",
  "sharded-slab",
  "smallvec",
  "thread_local",
+ "tracing",
  "tracing-core",
  "tracing-log",
 ]
@@ -531,12 +853,114 @@ version = "0.11.1+wasi-snapshot-preview1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b"
 
+[[package]]
+name = "windows"
+version = "0.61.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9babd3a767a4c1aef6900409f85f5d53ce2544ccdfaa86dad48c91782c6d6893"
+dependencies = [
+ "windows-collections",
+ "windows-core",
+ "windows-future",
+ "windows-link 0.1.3",
+ "windows-numerics",
+]
+
+[[package]]
+name = "windows-collections"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3beeceb5e5cfd9eb1d76b381630e82c4241ccd0d27f1a39ed41b2760b255c5e8"
+dependencies = [
+ "windows-core",
+]
+
+[[package]]
+name = "windows-core"
+version = "0.61.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c0fdd3ddb90610c7638aa2b3a3ab2904fb9e5cdbecc643ddb3647212781c4ae3"
+dependencies = [
+ "windows-implement",
+ "windows-interface",
+ "windows-link 0.1.3",
+ "windows-result",
+ "windows-strings",
+]
+
+[[package]]
+name = "windows-future"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fc6a41e98427b19fe4b73c550f060b59fa592d7d686537eebf9385621bfbad8e"
+dependencies = [
+ "windows-core",
+ "windows-link 0.1.3",
+ "windows-threading",
+]
+
+[[package]]
+name = "windows-implement"
+version = "0.60.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "053e2e040ab57b9dc951b72c264860db7eb3b0200ba345b4e4c3b14f67855ddf"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "windows-interface"
+version = "0.59.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f316c4a2570ba26bbec722032c4099d8c8bc095efccdc15688708623367e358"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "windows-link"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5e6ad25900d524eaabdbbb96d20b4311e1e7ae1699af4fb28c17ae66c80d798a"
+
 [[package]]
 name = "windows-link"
 version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5"
 
+[[package]]
+name = "windows-numerics"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9150af68066c4c5c07ddc0ce30421554771e528bde427614c61038bc2c92c2b1"
+dependencies = [
+ "windows-core",
+ "windows-link 0.1.3",
+]
+
+[[package]]
+name = "windows-result"
+version = "0.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "56f42bd332cc6c8eac5af113fc0c1fd6a8fd2aa08a0119358686e5160d0586c6"
+dependencies = [
+ "windows-link 0.1.3",
+]
+
+[[package]]
+name = "windows-strings"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "56e6c93f3a0c3b36176cb1327a4958a0353d5d166c2a35cb268ace15e91d3b57"
+dependencies = [
+ "windows-link 0.1.3",
+]
+
 [[package]]
 name = "windows-sys"
 version = "0.60.2"
@@ -552,7 +976,7 @@ version = "0.61.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ae137229bcbd6cdf0f7b80a31df61766145077ddf49416a728b02cb3921ff3fc"
 dependencies = [
- "windows-link",
+ "windows-link 0.2.1",
 ]
 
 [[package]]
@@ -561,7 +985,7 @@ version = "0.53.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4945f9f551b88e0d65f3db0bc25c33b8acea4d9e41163edf90dcd0b19f9069f3"
 dependencies = [
- "windows-link",
+ "windows-link 0.2.1",
  "windows_aarch64_gnullvm",
  "windows_aarch64_msvc",
  "windows_i686_gnu",
@@ -572,6 +996,15 @@ dependencies = [
  "windows_x86_64_msvc",
 ]
 
+[[package]]
+name = "windows-threading"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b66463ad2e0ea3bbf808b7f1d371311c80e115c0b71d60efc142cafbcfb057a6"
+dependencies = [
+ "windows-link 0.1.3",
+]
+
 [[package]]
 name = "windows_aarch64_gnullvm"
 version = "0.53.1"

Cargo.toml

@@ -5,6 +5,7 @@ edition = "2024"
 
 [dependencies]
 tokio = { version = "1.48.0", features = ["macros", "rt-multi-thread", "signal"] }
+tokio-stream = { version = "0.1.17", features = ["signal"] }
 toml = "0.9.8"
 serde = { version = "1.0.228", features = ["derive"] }
 clap = { version = "4.5.51", features = ["derive"] }
@@ -14,6 +15,8 @@ tracing-subscriber = "0.3.20"
 main_error = "0.1.2"
 nix = { version = "0.30.1", features = ["mount", "sched"] }
 sd-notify = "0.4.5"
+futures = "0.3.31"
+futures-concurrency = "7.6.3"
 
 [dev-dependencies]
 serde_test = "1.0.177"

nix/module.nix

@@ -60,9 +60,8 @@ in {
       wantedBy = ["multi-user.target"];
       serviceConfig = {
         Restart = "on-failure";
-        Type = "notify";
+        Type = "notify-reload";
         ExecStart = "${getExec cfg.pkg} daemon -c /etc/netnsd/netnsd.toml";
-        ExecReload = "${getExec cfg.pkg} reload";
         PrivateTmp = true;
         ProtectSystem = "full";
         ProtectHome = true;

src/config/destination.rs

@@ -28,7 +28,7 @@ impl<'de> Deserialize<'de> for ForwardDestination {
     {
         struct ForwardDestinationVisitor;
 
-        impl<'de> Visitor<'de> for ForwardDestinationVisitor {
+        impl Visitor<'_> for ForwardDestinationVisitor {
             type Value = ForwardDestination;
 
             fn expecting(&self, formatter: &mut Formatter) -> std::fmt::Result {
@@ -75,7 +75,7 @@ impl<'de> Deserialize<'de> for ForwardDestination {
                 }
                 let addr = v
                     .parse()
-                    .map_err(|_| E::invalid_value(Unexpected::Str(&v), &self))?;
+                    .map_err(|_| E::invalid_value(Unexpected::Str(v), &self))?;
                 Ok(ForwardDestination { addr })
             }
         }

src/config/mod.rs

@@ -29,12 +29,12 @@ impl Config {
             error,
             path: path.to_owned(),
         })?;
-        Ok(config
+        config
             .validate(path)
             .map_err(|error| ConfigError::Validation {
                 error,
                 path: path.to_owned(),
-            })?)
+            })
     }
 
     pub fn reload(&self) -> Result<Config, ConfigError> {

src/config/name.rs

@@ -3,7 +3,7 @@ use std::path::Path;
 use serde::{Deserialize, Deserializer};
 use serde::de::{Error, Unexpected, Visitor};
 
-#[derive(Debug, Clone, Eq, PartialEq)]
+#[derive(Debug, Clone, Eq, PartialEq, Hash)]
 pub struct NamespaceName(String);
 
 impl Display for NamespaceName {
@@ -37,7 +37,7 @@ impl<'de> Deserialize<'de> for NamespaceName {
     {
         struct NamespaceNameVisitor;
 
-        impl<'de> Visitor<'de> for NamespaceNameVisitor {
+        impl Visitor<'_> for NamespaceNameVisitor {
             type Value = NamespaceName;
 
             fn expecting(&self, formatter: &mut Formatter) -> std::fmt::Result {
@@ -82,7 +82,7 @@ fn validate_name(name: &str) -> bool {
 fn test_de() {
     use serde_test::{Token, assert_de_tokens, assert_de_tokens_error};
 
-    assert_de_tokens(&NamespaceName("foo".into()), &[Token::String("foo")]);;
+    assert_de_tokens(&NamespaceName("foo".into()), &[Token::String("foo")]);
 
     assert_de_tokens_error::<NamespaceName>(
         &[Token::String("foo/bar")],

src/config/source.rs

@@ -27,7 +27,7 @@ impl<'de> Deserialize<'de> for ForwardSource {
     {
         struct ForwardSourceVisitor;
 
-        impl<'de> Visitor<'de> for ForwardSourceVisitor {
+        impl Visitor<'_> for ForwardSourceVisitor {
             type Value = ForwardSource;
 
             fn expecting(&self, formatter: &mut Formatter) -> std::fmt::Result {
@@ -85,7 +85,7 @@ impl<'de> Deserialize<'de> for ForwardSource {
                     }
                     let addr = v
                         .parse()
-                        .map_err(|_| E::invalid_value(Unexpected::Str(&v), &self))?;
+                        .map_err(|_| E::invalid_value(Unexpected::Str(v), &self))?;
                     Ok(ForwardSource::Ip(addr))
                 }
             }

src/daemon/mod.rs

@@ -1,20 +1,27 @@
 mod namespace;
 
-use crate::config::{Config, NamespaceName};
+use crate::config::{Config, NamespaceConfig, NamespaceName};
 use crate::daemon::namespace::{NamespaceError, NetNs};
 use main_error::MainResult;
-use sd_notify::{notify, NotifyState};
+use sd_notify::{NotifyState, notify};
 use std::io::Error as IoError;
+use std::pin::pin;
+use futures::FutureExt;
 use thiserror::Error;
 use tokio::runtime::Runtime;
 use tokio::signal::ctrl_c;
+use tokio::signal::unix::{SignalKind, signal};
+use futures::StreamExt;
+use futures_concurrency::stream::Merge;
+use tokio_stream::wrappers::SignalStream;
+use tracing::{debug, error, info};
 
 pub fn daemon(config: Config) -> MainResult {
     let rt = Runtime::new()?;
     Ok(rt.block_on(daemon_async(config))?)
 }
 
-async fn daemon_async(config: Config) -> Result<(), DaemonError> {
+async fn daemon_async(mut config: Config) -> Result<(), DaemonError> {
     for namespace in &config.namespaces {
         println!("{}:", namespace.name);
         for forward in &namespace.forward {
@@ -22,28 +29,104 @@ async fn daemon_async(config: Config) -> Result<(), DaemonError> {
         }
     }
 
-    let namespaces = config
+    let mut state = State::default();
-        .namespaces
+    state.update(&config)?;
-        .iter()
-        .map(|ns| ActiveNamespace::new(&ns.name))
-        .collect::<Result<Vec<_>, _>>()?;
 
     // now the namespaces are setup, we can tell systemd to start any service depending on them
     notify(true, &[NotifyState::Ready]).map_err(DaemonError::Notify)?;
 
-    let _ = ctrl_c().await;
+    let reload_signal = signal(SignalKind::hangup()).map_err(DaemonError::ReloadSignal)?;
+    let reload_signal = SignalStream::new(reload_signal).map(|_| Event::Reload);
+    let quit_signal = ctrl_c().into_stream().map(|_| Event::Quit);
+
+    let events = (reload_signal, quit_signal).merge();
+
+    let mut events = pin!(events);
+    while let Some(event) = events.next().await {
+        debug!(?event, "handling event");
+        match event {
+            Event::Quit => {
+                break;
+            }
+            Event::Reload => {
+                info!("reloading config");
+
+                match NotifyState::monotonic_usec_now() {
+                    Ok(notify_time) => {
+                        notify(true, &[NotifyState::Reloading, notify_time]).map_err(DaemonError::Notify)?;
+                    }
+                    Err(error) => {
+                        error!(%error, "failed to get current time, not sending reload signal");
+                    }
+                }
+                
+                match config.reload() {
+                    Ok(new_config) => {
+                        state.update(&new_config)?;
+                        config = new_config;
+                    },
+                    Err(error) => {
+                        error!(%error, "Failed to load new config");
+                    }
+                }
+
+                notify(true, &[NotifyState::Ready]).map_err(DaemonError::Notify)?;
+            }
+        }
+    }
+
     Ok(())
 }
 
+#[derive(Debug)]
+enum Event {
+    Reload,
+    Quit,
+}
+
+#[derive(Default)]
+struct State {
+    namespaces: Vec<ActiveNamespace>,
+}
+
+impl State {
+    pub fn update(&mut self, config: &Config) -> Result<(), DaemonError> {
+        self.namespaces.retain(|existing| {
+            config
+                .namespaces
+                .iter()
+                .any(|new| &new.name == existing.name())
+        });
+
+        for new in &config.namespaces {
+            if !self.has_namespace(&new.name) {
+                self.namespaces.push(ActiveNamespace::new(new)?);
+            }
+        }
+        Ok(())
+    }
+
+    fn has_namespace(&self, name: &NamespaceName) -> bool {
+        self
+            .namespaces
+            .iter()
+            .any(|existing| existing.name() == name)
+    }
+}
+
 struct ActiveNamespace {
     ns: NetNs,
 }
 
 impl ActiveNamespace {
-    pub fn new(name: &NamespaceName) -> Result<Self, DaemonError> {
+    pub fn new(config: &NamespaceConfig) -> Result<Self, DaemonError> {
-        let ns = NetNs::new(name)?;
+        let ns = NetNs::new(&config.name)?;
         Ok(ActiveNamespace { ns })
     }
+
+    pub fn name(&self) -> &NamespaceName {
+        self.ns.name()
+    }
 }
 
 #[derive(Debug, Error)]
@@ -51,5 +134,7 @@ pub enum DaemonError {
     #[error(transparent)]
     Namespace(#[from] NamespaceError),
     #[error("Error sending notification to systemd: {0:#}")]
-    Notify(IoError)
+    Notify(IoError),
+    #[error("Error setting up reload signal listener: {0:#}")]
+    ReloadSignal(IoError),
 }

src/daemon/namespace.rs

@@ -7,16 +7,17 @@ use std::io::{Error as IoError, ErrorKind};
 use std::path::{Path, PathBuf};
 use std::thread::{JoinHandle, spawn};
 use thiserror::Error;
-use tracing::{debug, error};
+use tracing::{error, info};
 
 pub struct NetNs {
+    name: NamespaceName,
     path: PathBuf,
 }
 
 impl NetNs {
     /// Create a new named network namespace that will be removed when dropped
     pub fn new(name: &NamespaceName) -> Result<Self, NamespaceError> {
-        debug!(%name, "creating network namespace");
+        info!(%name, "creating network namespace");
         let parent = Path::new("/var/run/netns");
         create_dir_all(parent).map_err(NamespaceError::Parent)?;
         let path = parent.join(name);
@@ -38,14 +39,23 @@ impl NetNs {
             Ok(())
         });
         handle.join().unwrap()?;
-        Ok(NetNs { path })
+        Ok(NetNs {
+            name: name.clone(),
+            path
+        })
+    }
+}
+
+impl NetNs {
+    pub fn name(&self) -> &NamespaceName {
+        &self.name
     }
 }
 
 impl Drop for NetNs {
     fn drop(&mut self) {
         let name = self.path.file_name().unwrap().to_str().unwrap();
-        debug!(name, "deleting network namespace");
+        info!(name, "deleting network namespace");
         if let Err(error) = umount(&self.path) {
             error!(%error, path = %self.path.display(), "Failed to unmount network namespace");
         }