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/get.rs | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

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

diff --git a/src/configuration/uapi/get.rs b/src/configuration/uapi/get.rs
index 43d4735..f0746b3 100644
--- a/src/configuration/uapi/get.rs
+++ b/src/configuration/uapi/get.rs
@@ -2,12 +2,13 @@ use log;
 use std::io;
 
 use super::Configuration;
+use super::Endpoint;
 
 pub fn serialize<C: Configuration, W: io::Write>(writer: &mut W, config: &C) -> io::Result<()> {
     let mut write = |key: &'static str, value: String| {
         debug_assert!(value.is_ascii());
         debug_assert!(key.is_ascii());
-        log::trace!("UAPI: return : {} = {}", key, value);
+        log::trace!("UAPI: return : {}={}", key, value);
         writer.write(key.as_ref())?;
         writer.write(b"=")?;
         writer.write(value.as_ref())?;
@@ -30,6 +31,7 @@ pub fn serialize<C: Configuration, W: io::Write>(writer: &mut W, config: &C) ->
     // serialize all peers
     let mut peers = config.get_peers();
     while let Some(p) = peers.pop() {
+        write("public_key", hex::encode(p.public_key.as_bytes()))?;
         write("rx_bytes", p.rx_bytes.to_string())?;
         write("tx_bytes", p.tx_bytes.to_string())?;
         write(
@@ -40,7 +42,13 @@ pub fn serialize<C: Configuration, W: io::Write>(writer: &mut W, config: &C) ->
             "last_handshake_time_nsec",
             p.last_handshake_time_nsec.to_string(),
         )?;
-        write("public_key", hex::encode(p.public_key.as_bytes()))?;
+        write(
+            "persistent_keepalive_interval",
+            p.persistent_keepalive_interval.to_string(),
+        )?;
+        if let Some(endpoint) = p.endpoint {
+            write("endpoint", endpoint.into_address().to_string())?;
+        }
         write("preshared_key", hex::encode(p.preshared_key))?;
         for (ip, cidr) in p.allowed_ips {
             write("allowed_ip", ip.to_string() + "/" + &cidr.to_string())?;
-- 
cgit v1.2.3-59-g8ed1b