Made status a member of MessageHandler

Obtaining user list no longer library function

lib/messagehandler.h

@@ -170,6 +170,7 @@ class MessageHandler {
 protected:
 	bool useSSL = true;
 	SSL_CTX* sslctx = nullpointer;
+	int status = SUCCESS;
 
 	/**
 	 * Initializes the SSL context

lib/socktalkclient.h

@@ -169,8 +169,6 @@ class SockTalkClient : public MessageHandler {
 	std::string username;
 	MsgThread* msgThread;
 
-	int status = SUCCESS;
-
 	/**
 	 * Utility method for sending messages
 	 * @param msg Message to send

lib/socktalkserver.cpp

@@ -216,14 +216,6 @@ void SockTalkServer::sendTo(const std::string &msg, const std::string &recipient
 	}
 }
 
-std::string SockTalkServer::userList() {
-	std::string str = "\tConnected users:";
-	for (int i = 0; i < handlers.size(); i++) {
-		str += "\n\t\t" + handlers[i]->getUsername();
-	}
-	return str;
-}
-
 void SockTalkServer::addHandler(SockTalkClientHandler* ch) {
 	handlers.push_back(ch);
 	handleMessage("Incoming connection...", INFO, "Notice");

lib/socktalkserver.h

@@ -180,8 +180,6 @@ class SockTalkServer : public MessageHandler {
 	AcceptThread* acceptThread;
 	std::vector<SockTalkClientHandler*> handlers;
 
-	int status = SUCCESS;
-
 	/**
 	 * Check the handlers to see if any connections are dead, dropping
 	 * any handlers for clients that have disconnected
@@ -201,12 +199,6 @@ class SockTalkServer : public MessageHandler {
 	 */
 	virtual void closeServer();
 
-	/**
-	 * Obtain a list of the connected users
-	 * @return String representation of the user list
-	 */
-	std::string userList();
-
 	/**
 	 * Adds a new client handler
 	 * @param ch Client handler to add

stclient/server.cpp

@@ -182,6 +182,14 @@ void Server::run() {
 	std::cout << "Server closed" << std::endl;
 }
 
+std::string Server::userList() {
+	std::string str = "\tConnected users:";
+	for (int i = 0; i < handlers.size(); i++) {
+		str += "\n\t\t" + handlers[i]->getUsername();
+	}
+	return str;
+}
+
 int main(int argc, char * argv[]) {
 	int port;
 	if (argc == 2) {

stclient/server.h

@@ -153,6 +153,11 @@
 #include "socktalkserver.h"
 
 class Server : public SockTalkServer {
+	/**
+	 * Obtain a list of the connected users
+	 * @return String representation of the user list
+	 */
+	std::string userList();
 public:
 	using SockTalkServer::SockTalkServer;
 	virtual void handleMessage(const std::string&, int, const std::string&);