+ srv can now add and remove chatrooms

Author: Leo

Chatclient/src/main.cpp

@@ -6,14 +6,13 @@
 Client client;
 Interface gui;
 
-
 static std::string rcvMsg;
 static bool rcvdMsg = false;
 
 static std::string stopOptimizeThisWhileLoop;
 
 //other Threads task
-void waitingForMsg(Client client)
+void waitingForMsg(Client& client)
 {
 	while (true)
 	{

Chatserver/src/Server.cpp

@@ -126,10 +126,41 @@ void Server::addCr(int count)
 	for (int i = 0; i < count; i++)
 	{
 		m_Chatrooms.push_back(new Chatroom(m_Chatrooms.size()));
-		//send client chatroomchoices
 	}
-	for(SOCKET client : m_Clients)
+	for (SOCKET client : m_Clients)
+	{
 		sendMsgTo(client, "Chatroom:" + std::to_string(m_Chatrooms.size()));	//send new Chatroomcount to all connected clients
+	}
+}
+
+void Server::removeCr(int count)
+{
+	if (m_Chatrooms.size() >= count)
+	{
+		int oldSize = m_Chatrooms.size();
+		for (int i = 1; i <= count; i++)
+		{
+			auto clientsOnCr = m_Chatrooms[oldSize - i]->getClients();
+			for(SOCKET client : clientsOnCr)
+				sendMsgTo(client, "Server: Chatroom " + std::to_string(oldSize - i) + " got closed");	//send disconnect
+			std::cout << "Chatroom " + std::to_string(oldSize - i) + " got closed" << std::endl;
+			m_Chatrooms.erase(m_Chatrooms.begin() + oldSize - i);
+		}
+		for (SOCKET client : m_Clients)
+		{
+			sendMsgTo(client, "Chatroom:" + std::to_string(m_Chatrooms.size()));	//send new Chatroomcount to all connected clients
+		
+		}
+	}
+	else
+	{
+		std::cout << "There are only " + std::to_string(m_Chatrooms.size()) + " Chatrooms left" << std::endl;
+	}
+}
+
+int Server::getCrCount()
+{
+	return m_Chatrooms.size();
 }
 
 bool Server::sendMsgCr()	//sends rcv message to other clients

Chatserver/src/Server.h

@@ -24,6 +24,8 @@ class Server
 	bool sendMsgTo(SOCKET s, std::string msg);
 
 	void addCr(int count);
+	void removeCr(int count);
+	int getCrCount();
 	bool sendMsgCr();
 
 	std::string getMessage();

Chatserver/src/main.cpp

@@ -1,14 +1,75 @@
-#include <iostream>
 #include "Server.h"
 
+#include <thread>
+
+
+//other Threads task
+void waitingForUserInput(Server& srv)
+{
+	std::string userInput;
+	while (true)
+	{
+		std::getline(std::cin, userInput);
+		if (userInput.substr(0, 4) == "/add")
+		{
+			srv.addCr(std::stoi(userInput.substr(5, 1)));
+			std::cout << "Chatrooms: " + std::to_string(srv.getCrCount()) << std::endl;
+		}
+		else if (userInput.substr(0, 7) == "/remove")
+		{
+			srv.removeCr(std::stoi(userInput.substr(8, 1)));
+			std::cout << "Chatrooms: " + std::to_string(srv.getCrCount()) << std::endl;
+		}
+		else
+		{
+			std::cout << "You can only add a chatroom with /add and remove a chatroom with /remove" << std::endl;
+		}
+	}
+}
+
 int main()
 {
-	Server srv("192.168.1.4", 54000);
+	std::string serverIp;
+	std::string serverPort;
+
+	bool bindSrv = false;
+	while (!bindSrv)
+	{
+		char tmpBuf[4096];
+		std::cout << "Type in the network ip of your device to bind the srv to that ip. The clients can than connect to this ip." << std::endl;
+		std::cout << "Server-IP: ";
+		std::getline(std::cin, serverIp);
+		if (inet_pton(AF_INET, serverIp.c_str(), tmpBuf) <= 0)
+		{
+			std::cout << "Thats not a valid ip address" << std::endl;
+			bindSrv = false;
+			continue;
+		}
+		else
+			bindSrv = true;
+		std::cout << "Type in a portnumber between 49152 - 65535. The clients can than connect to this port." << std::endl;
+		std::cout << "Server-Port: ";
+		std::getline(std::cin, serverPort);
+		int srvPort = std::stoi(serverPort);
+		if (srvPort == -1 && srvPort >= 49152 && srvPort <= 65535)
+		{
+			std::cout << "Thats not a valid port" << std::endl;
+			bindSrv = false;
+			continue;
+		}
+		else
+			bindSrv = true;
+	}
+
+
+	Server srv(serverIp, std::stoi(serverPort));
 
 	if (!srv.init())	
 		std::cout << "Couldnt Init Winsock" << std::endl;
 
-	srv.addCr(5);
+	std::cout << "You can add a chatroom with /add and remove a chatroom with /remove" << std::endl;
+	std::thread userInputWorker = std::thread(waitingForUserInput, std::ref(srv));
+
 	if (srv.createListeningSocket())
 	{
 		while (true)
@@ -23,5 +84,7 @@ int main()
 	}
 
 	std::cin.get();
+	userInputWorker.detach();
+	srv.cleanUp();
 	return 0;
 }