Moved networking code into high cohesion functions

rsc/config.cfg

@@ -1,7 +1,7 @@
 #configuration of the programs
-server.host = 127.0.0.1
+server.host = 255.255.255.255
 server.port = 21795
-server.name = foobar
+server.name = local
 
 server.dbname = database.db
 

server/server_application.cpp

@@ -124,13 +124,36 @@ void ServerApplication::Quit() {
 void ServerApplication::HandlePacket(NetworkPacket packet) {
 	switch(packet.meta.type) {
 		case NetworkPacket::Type::BROADCAST_REQUEST:
+			HandleBroadcastRequest(packet);
+		break;
+
+		case NetworkPacket::Type::JOIN_REQUEST:
+			HandleJoinRequest(packet);
+		break;
+
+		case NetworkPacket::Type::DISCONNECT:
+			HandleDisconnect(packet);
+		break;
+
+		case NetworkPacket::Type::SHUTDOWN:
+			HandleShutdown(packet);
+		break;
+
+		//handle errors
+		default:
+			throw(runtime_error("Unknown NetworkPacket::Type encountered"));
+		break;
+	}
+}
+
+void ServerApplication::HandleBroadcastRequest(NetworkPacket packet) {
 	//send back the server's name
 	packet.meta.type = NetworkPacket::Type::BROADCAST_RESPONSE;
 	snprintf(packet.serverInfo.name, PACKET_STRING_SIZE, "%s", config["server.name"].c_str());
 	network.Send(&packet.meta.srcAddress, &packet, sizeof(NetworkPacket));
-		break;
+}
 
-		case NetworkPacket::Type::JOIN_REQUEST: {
+void ServerApplication::HandleJoinRequest(NetworkPacket packet) {
 	//TODO: prevent duplicate logins from the same address?
 
 	//create the new client, filling it with the correct info
@@ -148,24 +171,19 @@ void ServerApplication::HandlePacket(NetworkPacket packet) {
 	//finished this routine
 	Client::counter++;
 	cout << "connect, total: " << clientMap.size() << endl;
-		}
-		break;
+}
 
-		case NetworkPacket::Type::DISCONNECT:
+void ServerApplication::HandleDisconnect(NetworkPacket packet) {
 	//disconnect the specified client
 	network.Send(&clientMap[packet.clientInfo.index].address, &packet, sizeof(NetworkPacket));
 	clientMap.erase(packet.clientInfo.index);
 
-			//remove players?
+	//TODO: remove players?
 
 	cout << "disconnect, total: " << clientMap.size() << endl;
-		break;
+}
 
-		case NetworkPacket::Type::SYNCHRONIZE:
-			//TODO
-		break;
-
-		case NetworkPacket::Type::SHUTDOWN:
+void ServerApplication::HandleShutdown(NetworkPacket packet) {
 	//end the server
 	running = false;
 
@@ -176,11 +194,4 @@ void ServerApplication::HandlePacket(NetworkPacket packet) {
 	}
 
 	cout << "shutting down" << endl;
-		break;
-
-		//handle errors
-		default:
-			throw(runtime_error("Unknown NetworkPacket::Type encountered"));
-		break;
-	}
 }

server/server_application.hpp

@@ -56,6 +56,12 @@ public:
 private:
 	void HandlePacket(NetworkPacket);
 
+	//high cohesion utility functions
+	void HandleBroadcastRequest(NetworkPacket);
+	void HandleJoinRequest(NetworkPacket);
+	void HandleDisconnect(NetworkPacket);
+	void HandleShutdown(NetworkPacket);
+
 	//networking
 	UDPNetworkUtility network;