From abdf3eeb23ce82bc63c209082888c8083f39e3d2 Mon Sep 17 00:00:00 2001
From: folkert van heusden <mail@vanheusden.com>
Date: Fri, 17 May 2024 09:42:10 +0200
Subject: [PATCH] renamed tcp socket server

---
 CMakeLists.txt                                |  4 ++--
 ...p_socket.cpp => comm_tcp_socket_server.cpp | 22 +++++++++----------
 comm_tcp_socket.h => comm_tcp_socket_server.h |  6 ++---
 main.cpp                                      |  4 ++--
 4 files changed, 18 insertions(+), 18 deletions(-)
 rename comm_tcp_socket.cpp => comm_tcp_socket_server.cpp (88%)
 rename comm_tcp_socket.h => comm_tcp_socket_server.h (86%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index fb5eef2..7a429d9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -29,7 +29,7 @@ add_executable(
   bus.cpp
   comm.cpp
   comm_posix_tty.cpp
-  comm_tcp_socket.cpp
+  comm_tcp_socket_server.cpp
   console.cpp
   console_ncurses.cpp
   console_posix.cpp
@@ -80,7 +80,7 @@ add_executable(
   bus.cpp
   comm.cpp
   comm_posix_tty.cpp
-  comm_tcp_socket.cpp
+  comm_tcp_socket_server.cpp
   console.cpp
   console_posix.cpp
   cpu.cpp
diff --git a/comm_tcp_socket.cpp b/comm_tcp_socket_server.cpp
similarity index 88%
rename from comm_tcp_socket.cpp
rename to comm_tcp_socket_server.cpp
index 1ec1afb..53bcb46 100644
--- a/comm_tcp_socket.cpp
+++ b/comm_tcp_socket_server.cpp
@@ -28,7 +28,7 @@
 #include <unistd.h>
 #endif
 
-#include "comm_tcp_socket.h"
+#include "comm_tcp_socket_server.h"
 #include "log.h"
 #include "utils.h"
 
@@ -68,12 +68,12 @@ static bool setup_telnet_session(const int fd)
 	return true;
 }
 
-comm_tcp_socket::comm_tcp_socket(const int port) : port(port)
+comm_tcp_socket_server::comm_tcp_socket_server(const int port) : port(port)
 {
 	th = new std::thread(std::ref(*this));
 }
 
-comm_tcp_socket::~comm_tcp_socket()
+comm_tcp_socket_server::~comm_tcp_socket_server()
 {
 	stop_flag = true;
 
@@ -83,14 +83,14 @@ comm_tcp_socket::~comm_tcp_socket()
 	}
 }
 
-bool comm_tcp_socket::is_connected()
+bool comm_tcp_socket_server::is_connected()
 {
 	std::unique_lock<std::mutex> lck(cfd_lock);
 
 	return cfd != INVALID_SOCKET;
 }
 
-bool comm_tcp_socket::has_data()
+bool comm_tcp_socket_server::has_data()
 {
 	std::unique_lock<std::mutex> lck(cfd_lock);
 #if defined(_WIN32)
@@ -104,7 +104,7 @@ bool comm_tcp_socket::has_data()
 	return rc == 1;
 }
 
-uint8_t comm_tcp_socket::get_byte()
+uint8_t comm_tcp_socket_server::get_byte()
 {
 	int use_fd = -1;
 
@@ -123,7 +123,7 @@ uint8_t comm_tcp_socket::get_byte()
 	return c;
 }
 
-void comm_tcp_socket::send_data(const uint8_t *const in, const size_t n)
+void comm_tcp_socket_server::send_data(const uint8_t *const in, const size_t n)
 {
 	const uint8_t *p   = in;
 	size_t         len = n;
@@ -142,7 +142,7 @@ void comm_tcp_socket::send_data(const uint8_t *const in, const size_t n)
 	}
 }
 
-void comm_tcp_socket::operator()()
+void comm_tcp_socket_server::operator()()
 {
 	set_thread_name("kek:COMMTCP");
 
@@ -155,7 +155,7 @@ void comm_tcp_socket::operator()()
 		close(fd);
 		fd = INVALID_SOCKET;
 
-		DOLOG(warning, true, "Cannot set reuseaddress for port %d (comm_tcp_socket)", port);
+		DOLOG(warning, true, "Cannot set reuseaddress for port %d (comm_tcp_socket_server)", port);
 		return;
 	}
 
@@ -171,7 +171,7 @@ void comm_tcp_socket::operator()()
 		close(fd);
 		fd = INVALID_SOCKET;
 
-		DOLOG(warning, true, "Cannot bind to port %d (comm_tcp_socket)", port);
+		DOLOG(warning, true, "Cannot bind to port %d (comm_tcp_socket_server)", port);
 		return;
 	}
 
@@ -179,7 +179,7 @@ void comm_tcp_socket::operator()()
 		close(fd);
 		fd = INVALID_SOCKET;
 
-		DOLOG(warning, true, "Cannot listen on port %d (comm_tcp_socket)", port);
+		DOLOG(warning, true, "Cannot listen on port %d (comm_tcp_socket_server)", port);
 		return;
 	}
 
diff --git a/comm_tcp_socket.h b/comm_tcp_socket_server.h
similarity index 86%
rename from comm_tcp_socket.h
rename to comm_tcp_socket_server.h
index c61b704..97440c8 100644
--- a/comm_tcp_socket.h
+++ b/comm_tcp_socket_server.h
@@ -16,7 +16,7 @@
 #endif
 
 
-class comm_tcp_socket: public comm
+class comm_tcp_socket_server: public comm
 {
 private:
 	const int        port      { -1             };
@@ -27,8 +27,8 @@ private:
 	std::thread     *th        { nullptr        };
 
 public:
-	comm_tcp_socket(const int port);
-	virtual ~comm_tcp_socket();
+	comm_tcp_socket_server(const int port);
+	virtual ~comm_tcp_socket_server();
 
 	bool    is_connected() override;
 
diff --git a/main.cpp b/main.cpp
index 8debc5a..6d72d36 100644
--- a/main.cpp
+++ b/main.cpp
@@ -13,7 +13,7 @@
 #include "error.h"
 #include "comm.h"
 #include "comm_posix_tty.h"
-#include "comm_tcp_socket.h"
+#include "comm_tcp_socket_server.h"
 #if !defined(_WIN32)
 #include "console_ncurses.h"
 #endif
@@ -616,7 +616,7 @@ int main(int argc, char *argv[])
 
 	for(size_t i=comm_interfaces.size(); i<4; i++) {
 		int port = 1100 + i;
-		comm_interfaces.push_back(new comm_tcp_socket(port));
+		comm_interfaces.push_back(new comm_tcp_socket_server(port));
 		DOLOG(info, false, "Configuring DC11 device for TCP socket on port %d", port);
 	}