diff options
author | Mathias Hall-Andersen <mathias@hall-andersen.dk> | 2019-11-15 15:32:36 +0100 |
---|---|---|
committer | Mathias Hall-Andersen <mathias@hall-andersen.dk> | 2019-11-15 15:32:36 +0100 |
commit | 05710c455f1c759cf9bc1a1eaa6307fe564f15cc (patch) | |
tree | c671d703d0db93a9bc8f27d0e2b02d0422120352 /src/configuration/uapi/get.rs | |
parent | Initial version of full UAPI parser (diff) | |
download | wireguard-rs-05710c455f1c759cf9bc1a1eaa6307fe564f15cc.tar.xz wireguard-rs-05710c455f1c759cf9bc1a1eaa6307fe564f15cc.zip |
Update UAPI semantics for remove
Diffstat (limited to 'src/configuration/uapi/get.rs')
-rw-r--r-- | src/configuration/uapi/get.rs | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/configuration/uapi/get.rs b/src/configuration/uapi/get.rs index 9b05421..0874cfc 100644 --- a/src/configuration/uapi/get.rs +++ b/src/configuration/uapi/get.rs @@ -1,6 +1,8 @@ use hex::FromHex; use subtle::ConstantTimeEq; +use log; + use super::Configuration; use std::io; @@ -8,9 +10,11 @@ pub fn serialize<C: Configuration, W: io::Write>(writer: &mut W, config: &C) -> let mut write = |key: &'static str, value: String| { debug_assert!(value.is_ascii()); debug_assert!(key.is_ascii()); + log::trace!("UAPI: return : {} = {}", key, value); writer.write(key.as_ref())?; writer.write(b"=")?; - writer.write(value.as_ref()) + writer.write(value.as_ref())?; + writer.write(b"\n") }; // serialize interface @@ -40,9 +44,7 @@ pub fn serialize<C: Configuration, W: io::Write>(writer: &mut W, config: &C) -> p.last_handshake_time_nsec.to_string(), )?; write("public_key", hex::encode(p.public_key.as_bytes()))?; - if let Some(psk) = p.preshared_key { - write("preshared_key", hex::encode(psk))?; - } + write("preshared_key", hex::encode(p.preshared_key))?; for (ip, cidr) in p.allowed_ips { write("allowed_ip", ip.to_string() + "/" + &cidr.to_string())?; } |