From 92dbb4c46a5651afb8f92375e0ed154673929eeb Mon Sep 17 00:00:00 2001
From: Mathias Hall-Andersen <mathias@hall-andersen.dk>
Date: Thu, 21 Nov 2019 11:43:16 +0100
Subject: Clean dependencies and imports

---
 src/configuration/uapi/set.rs | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'src/configuration/uapi/set.rs')

diff --git a/src/configuration/uapi/set.rs b/src/configuration/uapi/set.rs
index 882e4a7..b44ee1c 100644
--- a/src/configuration/uapi/set.rs
+++ b/src/configuration/uapi/set.rs
@@ -56,33 +56,40 @@ impl<'a, C: Configuration> LineParser<'a, C> {
         // flush peer updates to configuration
         fn flush_peer<C: Configuration>(config: &C, peer: &ParsedPeer) -> Option<ConfigError> {
             if peer.remove {
+                log::trace!("flush peer, remove peer");
                 config.remove_peer(&peer.public_key);
                 return None;
             }
 
             if !peer.update_only {
+                log::trace!("flush peer, add peer");
                 config.add_peer(&peer.public_key);
             }
 
-            for (ip, masklen) in &peer.allowed_ips {
-                config.add_allowed_ip(&peer.public_key, *ip, *masklen);
+            for (ip, cidr) in &peer.allowed_ips {
+                log::trace!("flush peer, add allowed_ips : {}/{}", ip.to_string(), cidr);
+                config.add_allowed_ip(&peer.public_key, *ip, *cidr);
             }
 
             if let Some(psk) = peer.preshared_key {
+                log::trace!("flush peer, set preshared_key {}", hex::encode(psk));
                 config.set_preshared_key(&peer.public_key, psk);
             }
 
             if let Some(secs) = peer.persistent_keepalive_interval {
+                log::trace!("flush peer, set persistent_keepalive_interval {}", secs);
                 config.set_persistent_keepalive_interval(&peer.public_key, secs);
             }
 
             if let Some(version) = peer.protocol_version {
+                log::trace!("flush peer, set protocol_version {}", version);
                 if version == 0 || version > config.get_protocol_version() {
                     return Some(ConfigError::UnsupportedProtocolVersion);
                 }
             }
 
             if let Some(endpoint) = peer.endpoint {
+                log::trace!("flush peer, set endpoint {}", endpoint.to_string());
                 config.set_endpoint(&peer.public_key, endpoint);
             };
 
@@ -232,6 +239,7 @@ impl<'a, C: Configuration> LineParser<'a, C> {
 
                 // flush (used at end of transcipt)
                 "" => {
+                    log::trace!("UAPI, Set, processes end of transaction");
                     flush_peer(self.config, &peer);
                     Ok(())
                 }
-- 
cgit v1.2.3-59-g8ed1b