From 24656209f7fd4ce9615846a45f61160c793121da Mon Sep 17 00:00:00 2001
From: Tom Early <n7tae@tearly.net>
Date: Tue, 7 Jul 2020 22:02:08 -0700
Subject: [PATCH] XML IP address fix

---
 src/cclient.cpp | 10 +++++-----
 src/cpeer.cpp   |  2 +-
 src/main.h      |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/cclient.cpp b/src/cclient.cpp
index f79dcc2..99b20ad 100644
--- a/src/cclient.cpp
+++ b/src/cclient.cpp
@@ -19,7 +19,7 @@
 //    GNU General Public License for more details.
 //
 //    You should have received a copy of the GNU General Public License
-//    along with Foobar.  If not, see <http://www.gnu.org/licenses/>. 
+//    along with Foobar.  If not, see <http://www.gnu.org/licenses/>.
 // ----------------------------------------------------------------------------
 
 #include "main.h"
@@ -87,11 +87,11 @@ void CClient::WriteXml(std::ofstream &xmlFile)
 {
     xmlFile << "<NODE>" << std::endl;
     xmlFile << "\t<Callsign>" << m_Callsign << "</Callsign>" << std::endl;
-    xmlFile << "\t<IP>" << m_Ip << "</IP>" << std::endl;
+    xmlFile << "\t<IP>" << m_Ip.GetAddress() << "</IP>" << std::endl;
     xmlFile << "\t<LinkedModule>" << m_ReflectorModule << "</LinkedModule>" << std::endl;
     xmlFile << "\t<Protocol>" << GetProtocolName() << "</Protocol>" << std::endl;
     char mbstr[100];
-    if (std::strftime(mbstr, sizeof(mbstr), "%A %c", std::localtime(&m_ConnectTime))) 
+    if (std::strftime(mbstr, sizeof(mbstr), "%A %c", std::localtime(&m_ConnectTime)))
     {
         xmlFile << "\t<ConnectTime>" << mbstr << "</ConnectTime>" << std::endl;
     }
@@ -107,11 +107,11 @@ void CClient::GetJsonObject(char *Buffer)
     char sz[512];
     char mbstr[100];
     char cs[16];
-    
+
     if (std::strftime(mbstr, sizeof(mbstr), "%A %c", std::localtime(&m_LastHeardTime)))
     {
         m_Callsign.GetCallsignString(cs);
-        
+
         ::sprintf(sz, "{\"callsign\":\"%s\",\"module\":\"%c\",\"linkedto\":\"%c\",\"time\":\"%s\"}",
                   cs,
                   m_Callsign.GetModule(),
diff --git a/src/cpeer.cpp b/src/cpeer.cpp
index 65d0b69..1b4d580 100644
--- a/src/cpeer.cpp
+++ b/src/cpeer.cpp
@@ -132,7 +132,7 @@ void CPeer::WriteXml(std::ofstream &xmlFile)
 {
     xmlFile << "<PEER>" << std::endl;
     xmlFile << "\t<Callsign>" << m_Callsign << "</Callsign>" << std::endl;
-    xmlFile << "\t<IP>" << m_Ip << "</IP>" << std::endl;
+    xmlFile << "\t<IP>" << m_Ip.GetAddress() << "</IP>" << std::endl;
     xmlFile << "\t<LinkedModule>" << m_ReflectorModules << "</LinkedModule>" << std::endl;
     xmlFile << "\t<Protocol>" << GetProtocolName() << "</Protocol>" << std::endl;
     char mbstr[100];
diff --git a/src/main.h b/src/main.h
index 69fcad0..4dab32e 100644
--- a/src/main.h
+++ b/src/main.h
@@ -51,7 +51,7 @@
 
 #define VERSION_MAJOR                   2
 #define VERSION_MINOR                   4
-#define VERSION_REVISION                0
+#define VERSION_REVISION                27
 
 // global ------------------------------------------------------