Added "broadcast" and "listClients" functionality.

Broadcasting commands to all clients and listing them via listClients is now possible.
codingman · Sep 15, 2017 · 74bbd72 · 74bbd72
1 parent c350ec5
commit 74bbd72
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 9 deletions.
diff --git a/Server/SendGetMethods.cpp b/Server/SendGetMethods.cpp
@@ -61,7 +61,17 @@ bool Server::GetPacketType(int ID, PacketType & _packettype)
 void Server::SendString(int ID, std::string & _string, PacketType _packettype)
 {
 	PS::Message message(_string);
-	connections[ID]->pm.Append(message.toPacket(_packettype));
+	if (ID == -2)
+	{
+		for (int i = 0; i < connections.size(); i++)
+		{
+			connections[i]->pm.Append(message.toPacket(_packettype));
+		}
+	}
+	else
+	{
+		connections[ID]->pm.Append(message.toPacket(_packettype));
+	}
 }
 
 bool Server::GetString(int ID, std::string & _string)

diff --git a/Server/general.cpp b/Server/general.cpp
@@ -35,4 +35,4 @@ bool General::processParameter(std::string &command, std::string compCommand)
 	}
 	else
 		return false;
-}
+}
diff --git a/Server/general.h b/Server/general.h
@@ -12,7 +12,7 @@
 class General
 {
 public:	//functions
-	static void outputMsg(std::string message, int msgType); 
+	static void outputMsg(std::string message, int msgType);
 	static bool General::processParameter(std::string &command, std::string compCommand);
 public:	//variables
 	static bool cmdMode;

diff --git a/Server/server.cpp b/Server/server.cpp
@@ -50,7 +50,8 @@ void Server::HandleInput()
 	while (true)
 	{
 		std::getline(std::cin, userinput);
-		if (currentSessionID == -1)
+
+		if (currentSessionID == -1)			//handle command while not having selected a client
 		{
 			if (General::processParameter(userinput, "connect"))
 			{
@@ -61,23 +62,39 @@ void Server::HandleInput()
 				else
 				{
 					currentSessionID = inputInt;
-					General::outputMsg("Connected to Session " + currentSessionID, 1);
+					General::outputMsg("Connected to Session " + std::to_string(currentSessionID), 1);
 				}
 				inputInt = 0;
 				userinput.empty();
 			}
+			else if (General::processParameter(userinput, "broadcast"))		//broadcasts commands to all clients
+			{
+				General::outputMsg("Entering broadcast mode. To disable, type 'exitSession'", 1);
+				currentSessionID = -2;
+			}
+			else if (General::processParameter(userinput, "listClients"))	//counts clients (TODO: list clients)
+			{
+				if (connections.size() <= 0)
+				{
+					General::outputMsg("No Clients connected", 2);
+				}
+				else
+				{
+					General::outputMsg("Listing all Clients, Connected: " + std::to_string(connections.size()), 1);
+				}
+			}
 			else
 				General::outputMsg("Please connect to a session with 'connect'", 2);
 		}
-		else
+		else						//handle command when client is selected
 		{
 			if (userinput == "exitSession")
 			{
-				General::outputMsg("Exited Session " + currentSessionID, 1);
+				General::outputMsg("Exited Session " + std::to_string(currentSessionID), 1);
 				currentSessionID = -1;
 			}
 
-			if (General::processParameter(userinput, "switchSession"))
+			else if (General::processParameter(userinput, "switchSession"))
 			{
 				inputInt = atoi(userinput.c_str());
 				int tempInt = connections.size() - 1;
@@ -86,7 +103,7 @@ void Server::HandleInput()
 				else
 				{
 					currentSessionID = inputInt;
-					General::outputMsg("Switched to Session " + currentSessionID, 1);
+					General::outputMsg("Switched to Session " + std::to_string(currentSessionID), 1);
 				}
 				inputInt = 0;
 				userinput.empty();
-Original file line number
+Diff line change
@@ Expand Up @@
     	}
     	else
     		return false;
-    }
+    }