From 0a9ce3e45081cbdd9aadf26fbc35abf092d5e4fd Mon Sep 17 00:00:00 2001
From: "Jason D. McCormick" <jason@mfamily.org>
Date: Fri, 12 Jun 2020 13:43:07 -0400
Subject: [PATCH] convert bindaddr from const char * to std::string

---
 YSFReflector/Network.cpp      | 6 +++---
 YSFReflector/Network.h        | 2 +-
 YSFReflector/UDPSocket.cpp    | 8 ++++----
 YSFReflector/UDPSocket.h      | 2 +-
 YSFReflector/YSFReflector.cpp | 2 +-
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/YSFReflector/Network.cpp b/YSFReflector/Network.cpp
index 429938d..2de7679 100644
--- a/YSFReflector/Network.cpp
+++ b/YSFReflector/Network.cpp
@@ -44,10 +44,10 @@ CNetwork::~CNetwork()
 	delete[] m_status;
 }
 
-bool CNetwork::open(const char* bindaddr)
+bool CNetwork::open(const std::string& bindaddr)
 {
-	if (strlen(bindaddr) > 0)
-		::fprintf(stdout, "Opening YSF network connection on address %s\n", bindaddr);
+	if (bindaddr.length() > 0)
+		::fprintf(stdout, "Opening YSF network connection on address %s\n", bindaddr.c_str());
 	else 
 		::fprintf(stdout, "Opening YSF network connection on all interfaces\n");
 
diff --git a/YSFReflector/Network.h b/YSFReflector/Network.h
index cc16047..89bdae6 100644
--- a/YSFReflector/Network.h
+++ b/YSFReflector/Network.h
@@ -31,7 +31,7 @@ public:
 	CNetwork(unsigned int port, unsigned int id, const std::string& name, const std::string& description, bool debug);
 	~CNetwork();
 
-	bool open(const char* bindaddr);
+	bool open(const std::string& bindaddr);
 
 	bool writeData(const unsigned char* data, const in_addr& address, unsigned int port);
 	bool writePoll(const in_addr& address, unsigned int port);
diff --git a/YSFReflector/UDPSocket.cpp b/YSFReflector/UDPSocket.cpp
index 4a9d495..aed5326 100644
--- a/YSFReflector/UDPSocket.cpp
+++ b/YSFReflector/UDPSocket.cpp
@@ -102,7 +102,7 @@ in_addr CUDPSocket::lookup(const std::string& hostname)
 #endif
 }
 
-bool CUDPSocket::open(const char* bindaddr)
+bool CUDPSocket::open(const std::string& bindaddr)
 {
 	m_fd = ::socket(PF_INET, SOCK_DGRAM, 0);
 	if (m_fd < 0) {
@@ -120,10 +120,10 @@ bool CUDPSocket::open(const char* bindaddr)
 		addr.sin_family      = AF_INET;
 		addr.sin_port        = htons(m_port);
 
-		if ( strlen(bindaddr) > 0){
-			int validaddr = inet_pton(AF_INET, bindaddr, &(addr.sin_addr));
+		if ( bindaddr.length() > 0){
+			int validaddr = inet_pton(AF_INET, bindaddr.c_str(), &(addr.sin_addr));
 			if (validaddr != 1){
-				LogError("The BindAddress in the .ini is invalid - %s", bindaddr);
+				LogError("The BindAddress in the .ini is invalid - %s", bindaddr.c_str());
 				return false;
 			}
 		} else {
diff --git a/YSFReflector/UDPSocket.h b/YSFReflector/UDPSocket.h
index 880a501..7f1ea58 100644
--- a/YSFReflector/UDPSocket.h
+++ b/YSFReflector/UDPSocket.h
@@ -40,7 +40,7 @@ public:
 	CUDPSocket(unsigned int port = 0U);
 	~CUDPSocket();
 
-	bool open(const char* bindaddr);
+	bool open(const std::string& bindaddr);
 
 	int  read(unsigned char* buffer, unsigned int length, in_addr& address, unsigned int& port);
 	bool write(const unsigned char* buffer, unsigned int length, const in_addr& address, unsigned int port);
diff --git a/YSFReflector/YSFReflector.cpp b/YSFReflector/YSFReflector.cpp
index c25a595..cf48002 100644
--- a/YSFReflector/YSFReflector.cpp
+++ b/YSFReflector/YSFReflector.cpp
@@ -164,7 +164,7 @@ void CYSFReflector::run()
 
 	CNetwork network(m_conf.getNetworkPort(), m_conf.getId(), m_conf.getName(), m_conf.getDescription(), m_conf.getNetworkDebug());
 
-	ret = network.open(m_conf.getNetworkBindAddr().c_str());
+	ret = network.open(m_conf.getNetworkBindAddr());
 	if (!ret) {
 		::LogFinalise();
 		return;