From d6e19ce0a112bd2403ad0cb274808ce3e749b459 Mon Sep 17 00:00:00 2001 From: flu0r1ne Date: Thu, 17 Aug 2023 17:43:48 -0500 Subject: Add warnings for PreUp, PostUp, PreDown, PostDown, and SaveConfig configuration, no systemd-networkd eqiv --- src/wg2sd.cpp | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) (limited to 'src/wg2sd.cpp') diff --git a/src/wg2sd.cpp b/src/wg2sd.cpp index 23c6546..2087cf5 100644 --- a/src/wg2sd.cpp +++ b/src/wg2sd.cpp @@ -208,6 +208,16 @@ namespace wg2sd { } cfg.intf.listen_port = port; + } else if (key == "PreUp") { + cfg.intf.preup = value; + } else if (key == "PostUp") { + cfg.intf.postup = value; + } else if (key == "PreDown") { + cfg.intf.predown = value; + } else if (key == "PostDown") { + cfg.intf.postdown = value; + } else if (key == "SaveConfig") { + cfg.intf.save_config = value; } else { throw ParsingException("Invalid key in [Interface] section: " + key, line_no); } @@ -485,6 +495,23 @@ namespace wg2sd { std::string private_keyfile = hashed_keyfile_name(cfg.intf.private_key); + std::vector warnings; + +#define WarnOnIntfField(field_, field_name) \ +if(!cfg.intf.field_.empty()) { \ + warnings.push_back("[Interface] section contains a field \"" field_name "\" which does not have a systemd-networkd analog, omitting"); \ +} + + WarnOnIntfField(preup, "PreUp") + WarnOnIntfField(postup, "PostUp") + WarnOnIntfField(predown, "PreDown") + WarnOnIntfField(postdown, "PostDown") + WarnOnIntfField(save_config, "SaveConfig") + + if(!cfg.intf.preup.empty()) { + warnings.push_back("[Interface] section contains a field \"PreUp\" which does not have a systemd-networkd analog"); + } + return SystemdConfig { .netdev = { .name = cfg.intf.name + ".netdev", @@ -498,7 +525,8 @@ namespace wg2sd { .name = private_keyfile, .contents = cfg.intf.private_key + "\n", }, - .symmetric_keyfiles = std::move(symmetric_keyfiles) + .symmetric_keyfiles = std::move(symmetric_keyfiles), + .warnings = std::move(warnings) }; } -- cgit v1.2.3